diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 21:43:40 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 21:43:40 +0400 |
commit | 8d024c51071ded5e6d4fa500ee5f3c1ce4886d07 (patch) | |
tree | 1a10423704449a31e1fc8cd26f795ecb07b6f860 /libavcodec/svq3.c | |
parent | 7ef8d97b1aa9e142527debcaf993aa1ee8f08a9b (diff) | |
parent | cc8163e1a3601a56f722a4720516e860bf1c6198 (diff) |
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/svq3.c')
-rw-r--r-- | libavcodec/svq3.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 4b932ef87b..01a2e6a159 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -40,6 +40,8 @@ * http://samples.mplayerhq.hu/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov */ +#include <inttypes.h> + #include "libavutil/attributes.h" #include "internal.h" #include "avcodec.h" @@ -621,7 +623,8 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) vlc = svq3_get_ue_golomb(&h->gb); if (vlc >= 25U) { - av_log(h->avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc); + av_log(h->avctx, AV_LOG_ERROR, + "luma prediction:%"PRIu32"\n", vlc); return -1; } @@ -690,7 +693,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || h->pict_type == AV_PICTURE_TYPE_B)) { if ((vlc = svq3_get_ue_golomb(&h->gb)) >= 48U){ - av_log(h->avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc); + av_log(h->avctx, AV_LOG_ERROR, "cbp_vlc=%"PRIu32"\n", vlc); return -1; } @@ -812,7 +815,7 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) } if ((slice_id = svq3_get_ue_golomb(&h->gb)) >= 3) { - av_log(h->avctx, AV_LOG_ERROR, "illegal slice type %d \n", slice_id); + av_log(h->avctx, AV_LOG_ERROR, "illegal slice type %u \n", slice_id); return -1; } @@ -1001,7 +1004,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) } buf = av_malloc(buf_len); - av_log(avctx, AV_LOG_DEBUG, "watermark size: %dx%d\n", + av_log(avctx, AV_LOG_DEBUG, "watermark size: %ux%u\n", watermark_width, watermark_height); av_log(avctx, AV_LOG_DEBUG, "u1: %x u2: %x u3: %x compressed data size: %d offset: %d\n", @@ -1017,7 +1020,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) s->watermark_key = ff_svq1_packet_checksum(buf, buf_len, 0); s->watermark_key = s->watermark_key << 16 | s->watermark_key; av_log(avctx, AV_LOG_DEBUG, - "watermark key %#x\n", s->watermark_key); + "watermark key %#"PRIx32"\n", s->watermark_key); av_free(buf); #else av_log(avctx, AV_LOG_ERROR, |