diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-27 22:05:50 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-27 22:05:50 +0200 |
| commit | 349a26f50901732a0690d76487319c9d0df56ae0 (patch) | |
| tree | 3bbd5b8d671c445b836cf477245cf32ea8997a48 | |
| parent | 53dac6c23bdead2573a336128bc41810ab192def (diff) | |
| parent | 7a2b2b6a92c4b528ecb640790eca0aa790d858f4 (diff) | |
| download | ffmpeg-349a26f50901732a0690d76487319c9d0df56ae0.tar.gz | |
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>
| -rw-r--r-- | libavcodec/dxtory.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index ea5da610da..6f8652ad49 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -201,12 +201,12 @@ static int check_slice_size(AVCodecContext *avctx, if (slice_size > src_size - off) { 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); return AVERROR_INVALIDDATA; } 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); return AVERROR_INVALIDDATA; } @@ -214,7 +214,7 @@ static int check_slice_size(AVCodecContext *avctx, cur_slice_size = AV_RL32(src + off); if (cur_slice_size != slice_size - 16) { 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); } |