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/rv10.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/rv10.c')
| -rw-r--r-- | libavcodec/rv10.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 917208d490..8c14399b17 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -25,6 +25,8 @@ * RV10/RV20 decoder */ +#include <inttypes.h> + #include "libavutil/imgutils.h" #include "avcodec.h" @@ -507,7 +509,7 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx) } if (avctx->debug & FF_DEBUG_PICT_INFO) { - av_log(avctx, AV_LOG_DEBUG, "ver:%X ver0:%X\n", rv->sub_id, + av_log(avctx, AV_LOG_DEBUG, "ver:%X ver0:%"PRIX32"\n", rv->sub_id, ((uint32_t *) avctx->extradata)[0]); } |