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/4xm.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/4xm.c')
| -rw-r--r-- | libavcodec/4xm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 4add46fe4e..23ba1ecee7 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -24,6 +24,8 @@ * 4XM codec. */ +#include <inttypes.h> + #include "libavutil/avassert.h" #include "libavutil/frame.h" #include "libavutil/imgutils.h" @@ -831,7 +833,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, av_assert0(avctx->width % 16 == 0 && avctx->height % 16 == 0); if (buf_size < AV_RL32(buf + 4) + 8) { - av_log(f->avctx, AV_LOG_ERROR, "size mismatch %d %d\n", + av_log(f->avctx, AV_LOG_ERROR, "size mismatch %d %"PRIu32"\n", buf_size, AV_RL32(buf + 4)); return AVERROR_INVALIDDATA; } |