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/aic.c | |
| parent | 7ef8d97b1aa9e142527debcaf993aa1ee8f08a9b (diff) | |
| parent | cc8163e1a3601a56f722a4720516e860bf1c6198 (diff) | |
| download | ffmpeg-streaming-8d024c51071ded5e6d4fa500ee5f3c1ce4886d07.zip ffmpeg-streaming-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/aic.c')
| -rw-r--r-- | libavcodec/aic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/aic.c b/libavcodec/aic.c index a7e3691..373cf99 100644 --- a/libavcodec/aic.c +++ b/libavcodec/aic.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> + #include "avcodec.h" #include "bytestream.h" #include "dsputil.h" @@ -169,7 +171,7 @@ static int aic_decode_header(AICContext *ctx, const uint8_t *src, int size) width = AV_RB16(src + 6); height = AV_RB16(src + 8); if (frame_size > size) { - av_log(ctx->avctx, AV_LOG_ERROR, "Frame size should be %d got %d\n", + av_log(ctx->avctx, AV_LOG_ERROR, "Frame size should be %"PRIu32" got %d\n", frame_size, size); return AVERROR_INVALIDDATA; } |
