diff options
author | Carl Eugen Hoyos | 2016-03-09 14:00:22 +0100 |
---|---|---|
committer | Carl Eugen Hoyos | 2016-03-09 14:00:22 +0100 |
commit | 144ef773c7140d1ea49d54e65e989f4edcfe9958 (patch) | |
tree | 651757787a5424a0dad0a4a0df984cdb8aafbd6a | |
parent | 953b8c5a43ef3f48cc0464857efffe8fdc769b3d (diff) |
Use correct msvc type specifiers for ptrdiff_t and size_t.
-rw-r--r-- | libavcodec/alsdec.c | 4 | ||||
-rw-r--r-- | libavcodec/g2meet.c | 2 | ||||
-rw-r--r-- | libavcodec/hq_hqa.c | 4 | ||||
-rw-r--r-- | libavformat/http.c | 2 | ||||
-rw-r--r-- | libavformat/mov.c | 4 | ||||
-rw-r--r-- | libavformat/mpjpegdec.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 004351296b..81666c5149 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -1292,13 +1292,13 @@ static int revert_channel_correlation(ALSDecContext *ctx, ALSBlockData *bd, if (ch[dep].time_diff_sign) { t = -t; if (begin < t) { - av_log(ctx->avctx, AV_LOG_ERROR, "begin %td smaller than time diff index %d.\n", begin, t); + av_log(ctx->avctx, AV_LOG_ERROR, "begin %"PTRDIFF_SPECIFIER" smaller than time diff index %d.\n", begin, t); return AVERROR_INVALIDDATA; } begin -= t; } else { if (end < t) { - av_log(ctx->avctx, AV_LOG_ERROR, "end %td smaller than time diff index %d.\n", end, t); + av_log(ctx->avctx, AV_LOG_ERROR, "end %"PTRDIFF_SPECIFIER" smaller than time diff index %d.\n", end, t); return AVERROR_INVALIDDATA; } end -= t; diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 51e8bbcd7b..b0af3ec046 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -900,7 +900,7 @@ static int epic_jb_decode_tile(G2MContext *c, int tile_x, int tile_y, } if (src_size < els_dsize) { - av_log(avctx, AV_LOG_ERROR, "ePIC: data too short, needed %zu, got %zu\n", + av_log(avctx, AV_LOG_ERROR, "ePIC: data too short, needed %"SIZE_SPECIFIER", got %"SIZE_SPECIFIER"\n", els_dsize, src_size); return AVERROR_INVALIDDATA; } diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c index 3ef83d4eb4..8825f3d8b7 100644 --- a/libavcodec/hq_hqa.c +++ b/libavcodec/hq_hqa.c @@ -154,7 +154,7 @@ static int hq_decode_frame(HQContext *ctx, AVFrame *pic, slice_off[slice] >= slice_off[slice + 1] || slice_off[slice + 1] > data_size) { av_log(ctx->avctx, AV_LOG_ERROR, - "Invalid slice size %zu.\n", data_size); + "Invalid slice size %"SIZE_SPECIFIER".\n", data_size); break; } init_get_bits(&gb, src + slice_off[slice], @@ -277,7 +277,7 @@ static int hqa_decode_frame(HQContext *ctx, AVFrame *pic, size_t data_size) slice_off[slice] >= slice_off[slice + 1] || slice_off[slice + 1] > data_size) { av_log(ctx->avctx, AV_LOG_ERROR, - "Invalid slice size %zu.\n", data_size); + "Invalid slice size %"SIZE_SPECIFIER".\n", data_size); break; } init_get_bits(&gb, src + slice_off[slice], diff --git a/libavformat/http.c b/libavformat/http.c index ae77b646f7..f18d9e28a1 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -370,7 +370,7 @@ static int http_write_reply(URLContext* h, int status_code) message_len = snprintf(message, sizeof(message), "HTTP/1.1 %03d %s\r\n" "Content-Type: %s\r\n" - "Content-Length: %zu\r\n" + "Content-Length: %"SIZE_SPECIFIER"\r\n" "\r\n" "%03d %s\r\n", reply_code, diff --git a/libavformat/mov.c b/libavformat/mov.c index 752bc129a6..4f446ba8cd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4209,7 +4209,7 @@ static int mov_seek_auxiliary_info(AVFormatContext *s, MOVStreamContext *sc) auxiliary_info_seek_offset = sc->cenc.auxiliary_info_default_size * sc->current_sample; } else if (sc->cenc.auxiliary_info_sizes) { if (sc->current_sample > sc->cenc.auxiliary_info_sizes_count) { - av_log(s, AV_LOG_ERROR, "current sample %d greater than the number of auxiliary info sample sizes %zu\n", + av_log(s, AV_LOG_ERROR, "current sample %d greater than the number of auxiliary info sample sizes %"SIZE_SPECIFIER"\n", sc->current_sample, sc->cenc.auxiliary_info_sizes_count); return AVERROR_INVALIDDATA; } @@ -4220,7 +4220,7 @@ static int mov_seek_auxiliary_info(AVFormatContext *s, MOVStreamContext *sc) } if (auxiliary_info_seek_offset > sc->cenc.auxiliary_info_end - sc->cenc.auxiliary_info) { - av_log(s, AV_LOG_ERROR, "auxiliary info offset %zu greater than auxiliary info size %zu\n", + av_log(s, AV_LOG_ERROR, "auxiliary info offset %"SIZE_SPECIFIER" greater than auxiliary info size %"SIZE_SPECIFIER"\n", auxiliary_info_seek_offset, (size_t)(sc->cenc.auxiliary_info_end - sc->cenc.auxiliary_info)); return AVERROR_INVALIDDATA; } diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c index 4c2a46ba74..6f85e5620f 100644 --- a/libavformat/mpjpegdec.c +++ b/libavformat/mpjpegdec.c @@ -201,7 +201,7 @@ static int parse_multipart_header(AVIOContext *pb, if (log_ctx) av_log(log_ctx, AV_LOG_ERROR, - "Expected boundary '%s' not found, instead found a line of %zu bytes\n", + "Expected boundary '%s' not found, instead found a line of %"SIZE_SPECIFIER" bytes\n", expected_boundary, strlen(line)); |