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/tscc2.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/tscc2.c')
| -rw-r--r-- | libavcodec/tscc2.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c index bdc75256b3..487af5462c 100644 --- a/libavcodec/tscc2.c +++ b/libavcodec/tscc2.c @@ -24,6 +24,8 @@ * TechSmith Screen Codec 2 decoder */ +#include <inttypes.h> + #define BITSTREAM_READER_LE #include "avcodec.h" #include "get_bits.h" @@ -227,7 +229,8 @@ static int tscc2_decode_frame(AVCodecContext *avctx, void *data, bytestream2_init(&gb, buf, buf_size); frame_type = bytestream2_get_byte(&gb); if (frame_type > 1) { - av_log(avctx, AV_LOG_ERROR, "Incorrect frame type %d\n", frame_type); + av_log(avctx, AV_LOG_ERROR, "Incorrect frame type %"PRIu32"\n", + frame_type); return AVERROR_INVALIDDATA; } @@ -309,7 +312,7 @@ static int tscc2_decode_frame(AVCodecContext *avctx, void *data, } } if (bytestream2_get_bytes_left(&gb) < size) { - av_log(avctx, AV_LOG_ERROR, "Invalid slice size (%d/%d)\n", + av_log(avctx, AV_LOG_ERROR, "Invalid slice size (%"PRIu32"/%u)\n", size, bytestream2_get_bytes_left(&gb)); return AVERROR_INVALIDDATA; } |