aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/alsdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-22 18:43:40 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-22 18:43:40 +0100
commit8d024c51071ded5e6d4fa500ee5f3c1ce4886d07 (patch)
tree1a10423704449a31e1fc8cd26f795ecb07b6f860 /libavcodec/alsdec.c
parent7ef8d97b1aa9e142527debcaf993aa1ee8f08a9b (diff)
parentcc8163e1a3601a56f722a4720516e860bf1c6198 (diff)
downloadffmpeg-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/alsdec.c')
-rw-r--r--libavcodec/alsdec.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 27d190241c..ace69746cf 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -25,6 +25,8 @@
* @author Thilo Borgmann <thilo.borgmann _at_ mail.de>
*/
+#include <inttypes.h>
+
#include "avcodec.h"
#include "get_bits.h"
#include "unary.h"
@@ -722,7 +724,9 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
int offset = parcor_rice_table[sconf->coef_table][k][0];
quant_cof[k] = decode_rice(gb, rice_param) + offset;
if (quant_cof[k] < -64 || quant_cof[k] > 63) {
- av_log(avctx, AV_LOG_ERROR, "quant_cof %d is out of range.\n", quant_cof[k]);
+ av_log(avctx, AV_LOG_ERROR,
+ "quant_cof %"PRIu32" is out of range.\n",
+ quant_cof[k]);
return AVERROR_INVALIDDATA;
}
}
@@ -1397,7 +1401,8 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame)
bd.block_length = div_blocks[b];
if (bd.block_length <= 0) {
av_log(ctx->avctx, AV_LOG_WARNING,
- "Invalid block length %d in channel data!\n", bd.block_length);
+ "Invalid block length %u in channel data!\n",
+ bd.block_length);
continue;
}