diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 01:22:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 01:22:46 +0200 |
| commit | d55d8229fb120aeed7387ca749f59c404dec6304 (patch) | |
| tree | 224271a884ad85e453011e9398479e09f3b1bb45 | |
| parent | 60831f441db8f18b619613f6dd942e3091687496 (diff) | |
| parent | 019a28cd630286ecb2b06ee62025a17c821b493e (diff) | |
| download | ffmpeg-d55d8229fb120aeed7387ca749f59c404dec6304.tar.gz | |
Merge commit '019a28cd630286ecb2b06ee62025a17c821b493e'
* commit '019a28cd630286ecb2b06ee62025a17c821b493e':
sanm: Use correct printf conversion specifiers for POSIX int types
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/sanm.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 880ef8fa22..9e5ec5400e 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -1407,14 +1407,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, pos = bytestream2_tell(&ctx->gb); if (bytestream2_get_bytes_left(&ctx->gb) < size) { - av_log(avctx, AV_LOG_ERROR, "Incorrect chunk size %d.\n", size); + av_log(avctx, AV_LOG_ERROR, "Incorrect chunk size %"PRIu32".\n", size); break; } switch (sig) { case MKBETAG('N', 'P', 'A', 'L'): if (size != PALETTE_SIZE * 3) { av_log(avctx, AV_LOG_ERROR, - "Incorrect palette block size %d.\n", size); + "Incorrect palette block size %"PRIu32".\n", size); return AVERROR_INVALIDDATA; } for (i = 0; i < PALETTE_SIZE; i++) @@ -1440,7 +1440,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, } } else { if (size < PALETTE_DELTA * 2 + 4) { - av_log(avctx, AV_LOG_ERROR, "Incorrect palette change block size %d.\n", + av_log(avctx, AV_LOG_ERROR, + "Incorrect palette change block size %"PRIu32".\n", size); return AVERROR_INVALIDDATA; } @@ -1463,7 +1464,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, break; default: bytestream2_skip(&ctx->gb, size); - av_log(avctx, AV_LOG_DEBUG, "Unknown/unsupported chunk %x.\n", sig); + av_log(avctx, AV_LOG_DEBUG, + "Unknown/unsupported chunk %"PRIx32".\n", sig); break; } |