virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Use correct msvc type specifiers for ptrdiff_t and size_t.

Browse Source
This commit is contained in:
Carl Eugen Hoyos 2016-03-09 14:00:22 +01:00
parent 953b8c5a43
commit 144ef773c7
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/alsdec.c
View File

@ -1292,13 +1292,13 @@ static int revert_channel_correlation(ALSDecContext *ctx, ALSBlockData *bd,
if (ch[dep].time_diff_sign) { if (ch[dep].time_diff_sign) {
t = -t; t = -t;
if (begin < 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; return AVERROR_INVALIDDATA;
} }
begin -= t; begin -= t;
} else { } else {
if (end < t) { 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; return AVERROR_INVALIDDATA;
} }
end -= t; end -= t;

2
libavcodec/g2meet.c
View File

@ -900,7 +900,7 @@ static int epic_jb_decode_tile(G2MContext *c, int tile_x, int tile_y,
} }
if (src_size < els_dsize) { 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); els_dsize, src_size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }

4
libavcodec/hq_hqa.c
View File

@ -154,7 +154,7 @@ static int hq_decode_frame(HQContext *ctx, AVFrame *pic,
slice_off[slice] >= slice_off[slice + 1] || slice_off[slice] >= slice_off[slice + 1] ||
slice_off[slice + 1] > data_size) { slice_off[slice + 1] > data_size) {
av_log(ctx->avctx, AV_LOG_ERROR, av_log(ctx->avctx, AV_LOG_ERROR,
"Invalid slice size %zu.\n", data_size); "Invalid slice size %"SIZE_SPECIFIER".\n", data_size);
break; break;
} }
init_get_bits(&gb, src + slice_off[slice], 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] >= slice_off[slice + 1] ||
slice_off[slice + 1] > data_size) { slice_off[slice + 1] > data_size) {
av_log(ctx->avctx, AV_LOG_ERROR, av_log(ctx->avctx, AV_LOG_ERROR,
"Invalid slice size %zu.\n", data_size); "Invalid slice size %"SIZE_SPECIFIER".\n", data_size);
break; break;
} }
init_get_bits(&gb, src + slice_off[slice], init_get_bits(&gb, src + slice_off[slice],

2
libavformat/http.c
View File

@ -370,7 +370,7 @@ static int http_write_reply(URLContext* h, int status_code)
message_len = snprintf(message, sizeof(message), message_len = snprintf(message, sizeof(message),
"HTTP/1.1 %03d %s\r\n" "HTTP/1.1 %03d %s\r\n"
"Content-Type: %s\r\n" "Content-Type: %s\r\n"
"Content-Length: %zu\r\n" "Content-Length: %"SIZE_SPECIFIER"\r\n"
"\r\n" "\r\n"
"%03d %s\r\n", "%03d %s\r\n",
reply_code, reply_code,

4
libavformat/mov.c
View File

@ -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; auxiliary_info_seek_offset = sc->cenc.auxiliary_info_default_size * sc->current_sample;
} else if (sc->cenc.auxiliary_info_sizes) { } else if (sc->cenc.auxiliary_info_sizes) {
if (sc->current_sample > sc->cenc.auxiliary_info_sizes_count) { 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); sc->current_sample, sc->cenc.auxiliary_info_sizes_count);
return AVERROR_INVALIDDATA; 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) { 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)); auxiliary_info_seek_offset, (size_t)(sc->cenc.auxiliary_info_end - sc->cenc.auxiliary_info));
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }

2
libavformat/mpjpegdec.c
View File

@ -201,7 +201,7 @@ static int parse_multipart_header(AVIOContext *pb,
if (log_ctx) if (log_ctx)
av_log(log_ctx, av_log(log_ctx,
AV_LOG_ERROR, 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, expected_boundary,
strlen(line)); strlen(line));