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/utvideodec.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/utvideodec.c')
| -rw-r--r-- | libavcodec/utvideodec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index e3ef22d2a2..b5a390746c 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -24,6 +24,7 @@ * Ut Video decoder */ +#include <inttypes.h> #include <stdlib.h> #include "libavutil/intreadwrite.h" @@ -367,7 +368,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return AVERROR_INVALIDDATA; } c->frame_info = bytestream2_get_le32u(&gb); - av_log(avctx, AV_LOG_DEBUG, "frame information flags %X\n", c->frame_info); + av_log(avctx, AV_LOG_DEBUG, "frame information flags %"PRIX32"\n", + c->frame_info); c->frame_pred = (c->frame_info >> 8) & 3; @@ -488,7 +490,7 @@ static av_cold int decode_init(AVCodecContext *avctx) if (c->frame_info_size != 4) avpriv_request_sample(avctx, "Frame info not 4 bytes"); - av_log(avctx, AV_LOG_DEBUG, "Encoding parameters %08X\n", c->flags); + av_log(avctx, AV_LOG_DEBUG, "Encoding parameters %08"PRIX32"\n", c->flags); c->slices = (c->flags >> 24) + 1; c->compression = c->flags & 1; c->interlaced = c->flags & 0x800; |