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/lagarith.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/lagarith.c')
| -rw-r--r-- | libavcodec/lagarith.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index 69fa33704a..7c2f27de0f 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -25,6 +25,8 @@ * @author Nathan Caldwell */ +#include <inttypes.h> + #include "avcodec.h" #include "get_bits.h" #include "mathops.h" @@ -460,7 +462,7 @@ static int lag_decode_arith_plane(LagarithContext *l, uint8_t *dst, if (read > length) av_log(l->avctx, AV_LOG_WARNING, - "Output more bytes than length (%d of %d)\n", read, + "Output more bytes than length (%d of %"PRIu32")\n", read, length); } else if (esc_count < 8) { esc_count -= 4; @@ -711,7 +713,7 @@ static int lag_decode_frame(AVCodecContext *avctx, break; default: av_log(avctx, AV_LOG_ERROR, - "Unsupported Lagarith frame type: %#x\n", frametype); + "Unsupported Lagarith frame type: %#"PRIu8"\n", frametype); return AVERROR_PATCHWELCOME; } |