RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '7a2b2b6a92c4b528ecb640790eca0aa790d858f4' 

* commit '7a2b2b6a92c4b528ecb640790eca0aa790d858f4':
  dxtory: Drop nonsense ISO C printf conversion specifiers for standard types

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-27 22:05:50 +02:00
parent 53dac6c23b 7a2b2b6a92
commit 349a26f509
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dxtory.c
View File

@ -201,12 +201,12 @@ static int check_slice_size(AVCodecContext *avctx,
if (slice_size > src_size - off) { if (slice_size > src_size - off) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"invalid slice size %"PRIu32" (only %"PRIu32" bytes left)\n", "invalid slice size %d (only %d bytes left)\n",
slice_size, src_size - off); slice_size, src_size - off);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (slice_size <= 16) { if (slice_size <= 16) {
av_log(avctx, AV_LOG_ERROR, "invalid slice size %"PRIu32"\n", av_log(avctx, AV_LOG_ERROR, "invalid slice size %d\n",
slice_size); slice_size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -214,7 +214,7 @@ static int check_slice_size(AVCodecContext *avctx,
cur_slice_size = AV_RL32(src + off); cur_slice_size = AV_RL32(src + off);
if (cur_slice_size != slice_size - 16) { if (cur_slice_size != slice_size - 16) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Slice sizes mismatch: got %"PRIu32" instead of %"PRIu32"\n", "Slice sizes mismatch: got %d instead of %d\n",
cur_slice_size, slice_size - 16); cur_slice_size, slice_size - 16);
} }