diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 18:43:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 18:43:40 +0100 |
| commit | 8d024c51071ded5e6d4fa500ee5f3c1ce4886d07 (patch) | |
| tree | 1a10423704449a31e1fc8cd26f795ecb07b6f860 /libavcodec/mss12.c | |
| parent | 7ef8d97b1aa9e142527debcaf993aa1ee8f08a9b (diff) | |
| parent | cc8163e1a3601a56f722a4720516e860bf1c6198 (diff) | |
| download | ffmpeg-8d024c51071ded5e6d4fa500ee5f3c1ce4886d07.tar.gz | |
Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'
* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198':
avcodec: more correct printf specifiers
Conflicts:
libavcodec/4xm.c
libavcodec/alsdec.c
libavcodec/dfa.c
libavcodec/h264_ps.c
libavcodec/jpeg2000dec.c
libavcodec/lagarith.c
libavcodec/mpeg12dec.c
libavcodec/rv10.c
libavcodec/svq3.c
libavcodec/wmaprodec.c
libavcodec/xwddec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mss12.c')
| -rw-r--r-- | libavcodec/mss12.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/mss12.c b/libavcodec/mss12.c index b522e4a408..7d54d2917a 100644 --- a/libavcodec/mss12.c +++ b/libavcodec/mss12.c @@ -23,6 +23,8 @@ * Common functions for Microsoft Screen 1 and 2 */ +#include <inttypes.h> + #include "libavutil/intfloat.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" @@ -573,7 +575,7 @@ av_cold int ff_mss12_decode_init(MSS12Context *c, int version, if (AV_RB32(avctx->extradata) < avctx->extradata_size) { av_log(avctx, AV_LOG_ERROR, - "Insufficient extradata size: expected %d got %d\n", + "Insufficient extradata size: expected %"PRIu32" got %d\n", AV_RB32(avctx->extradata), avctx->extradata_size); return AVERROR_INVALIDDATA; @@ -592,7 +594,7 @@ av_cold int ff_mss12_decode_init(MSS12Context *c, int version, return AVERROR_INVALIDDATA; } - av_log(avctx, AV_LOG_DEBUG, "Encoder version %d.%d\n", + av_log(avctx, AV_LOG_DEBUG, "Encoder version %"PRIu32".%"PRIu32"\n", AV_RB32(avctx->extradata + 4), AV_RB32(avctx->extradata + 8)); if (version != AV_RB32(avctx->extradata + 4) > 1) { av_log(avctx, AV_LOG_ERROR, @@ -609,13 +611,13 @@ av_cold int ff_mss12_decode_init(MSS12Context *c, int version, } av_log(avctx, AV_LOG_DEBUG, "%d free colour(s)\n", c->free_colours); - av_log(avctx, AV_LOG_DEBUG, "Display dimensions %dx%d\n", + av_log(avctx, AV_LOG_DEBUG, "Display dimensions %"PRIu32"x%"PRIu32"\n", AV_RB32(avctx->extradata + 12), AV_RB32(avctx->extradata + 16)); av_log(avctx, AV_LOG_DEBUG, "Coded dimensions %dx%d\n", avctx->coded_width, avctx->coded_height); av_log(avctx, AV_LOG_DEBUG, "%g frames per second\n", av_int2float(AV_RB32(avctx->extradata + 28))); - av_log(avctx, AV_LOG_DEBUG, "Bitrate %d bps\n", + av_log(avctx, AV_LOG_DEBUG, "Bitrate %"PRIu32" bps\n", AV_RB32(avctx->extradata + 32)); av_log(avctx, AV_LOG_DEBUG, "Max. lead time %g ms\n", av_int2float(AV_RB32(avctx->extradata + 36))); |