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/alac.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/alac.c')
| -rw-r--r-- | libavcodec/alac.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 1e28efd715..103d14eada 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -45,6 +45,8 @@ * 32bit samplerate */ +#include <inttypes.h> + #include "libavutil/channel_layout.h" #include "avcodec.h" #include "get_bits.h" @@ -283,7 +285,7 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index, else output_samples = alac->max_samples_per_frame; if (!output_samples || output_samples > alac->max_samples_per_frame) { - av_log(avctx, AV_LOG_ERROR, "invalid samples per frame: %d\n", + av_log(avctx, AV_LOG_ERROR, "invalid samples per frame: %"PRIu32"\n", output_samples); return AVERROR_INVALIDDATA; } @@ -294,7 +296,7 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index, if ((ret = ff_thread_get_buffer(avctx, &tframe, 0)) < 0) return ret; } else if (output_samples != alac->nb_samples) { - av_log(avctx, AV_LOG_ERROR, "sample count mismatch: %u != %d\n", + av_log(avctx, AV_LOG_ERROR, "sample count mismatch: %"PRIu32" != %d\n", output_samples, alac->nb_samples); return AVERROR_INVALIDDATA; } @@ -549,7 +551,8 @@ static int alac_set_info(ALACContext *alac) alac->max_samples_per_frame = bytestream2_get_be32u(&gb); if (!alac->max_samples_per_frame || alac->max_samples_per_frame > INT_MAX / sizeof(int32_t)) { - av_log(alac->avctx, AV_LOG_ERROR, "max samples per frame invalid: %u\n", + av_log(alac->avctx, AV_LOG_ERROR, + "max samples per frame invalid: %"PRIu32"\n", alac->max_samples_per_frame); return AVERROR_INVALIDDATA; } |