diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-07 10:40:15 -0800 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-07 10:40:15 -0800 |
commit | 626964a4c4dbeff6d951c32f6e40dc5d96f75ea7 (patch) | |
tree | 6e2e87898e97028fb59ddc62c62a632af9f424bc | |
parent | 8febcb9fc178926687ee19d32d2b3150da899867 (diff) | |
download | ffmpeg-626964a4c4dbeff6d951c32f6e40dc5d96f75ea7.tar.gz |
wmall: fix build with -DDEBUG enabled.
-rw-r--r-- | libavcodec/wmalosslessdec.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index db2d4844db..6bd8bfbc0a 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -196,8 +196,8 @@ static av_cold int decode_init(AVCodecContext *avctx) } /* dump the extradata */ for (i = 0; i < avctx->extradata_size; i++) - av_dlog(avctx, AV_LOG_DEBUG, "[%x] ", avctx->extradata[i]); - av_dlog(avctx, AV_LOG_DEBUG, "\n"); + av_dlog(avctx, "[%x] ", avctx->extradata[i]); + av_dlog(avctx, "\n"); } else { av_log_ask_for_sample(avctx, "Unsupported extradata size\n"); @@ -407,7 +407,6 @@ static void decode_mclms(WmallDecodeCtx *s) if (get_bits1(&s->gb)) { int i, send_coef_bits; int cbits = av_log2(s->mclms_scaling + 1); - assert(cbits == my_log2(s->mclms_scaling + 1)); if (1 << cbits < s->mclms_scaling + 1) cbits++; @@ -866,7 +865,7 @@ static int decode_subframe(WmallDecodeCtx *s) s->do_arith_coding = get_bits1(&s->gb); if (s->do_arith_coding) { - av_dlog(s->avctx, AV_LOG_DEBUG, "do_arith_coding == 1"); + av_dlog(s->avctx, "do_arith_coding == 1"); abort(); } s->do_ac_filter = get_bits1(&s->gb); @@ -915,7 +914,7 @@ static int decode_subframe(WmallDecodeCtx *s) if (rawpcm_tile) { int bits = s->bits_per_sample - padding_zeroes; - av_dlog(s->avctx, AV_LOG_DEBUG, "RAWPCM %d bits per sample. " + av_dlog(s->avctx, "RAWPCM %d bits per sample. " "total %d bits, remain=%d\n", bits, bits * s->num_channels * subframe_len, get_bits_count(&s->gb)); for (i = 0; i < s->num_channels; i++) @@ -1010,13 +1009,13 @@ static int decode_frame(WmallDecodeCtx *s) /* usually true for the first frame */ if (get_bits1(gb)) { skip = get_bits(gb, av_log2(s->samples_per_frame * 2)); - av_dlog(s->avctx, AV_LOG_DEBUG, "start skip: %i\n", skip); + av_dlog(s->avctx, "start skip: %i\n", skip); } /* sometimes true for the last frame */ if (get_bits1(gb)) { skip = get_bits(gb, av_log2(s->samples_per_frame * 2)); - av_dlog(s->avctx, AV_LOG_DEBUG, "end skip: %i\n", skip); + av_dlog(s->avctx, "end skip: %i\n", skip); } } @@ -1036,7 +1035,7 @@ static int decode_frame(WmallDecodeCtx *s) } } - av_dlog(s->avctx, AV_LOG_DEBUG, "Frame done\n"); + av_dlog(s->avctx, "Frame done\n"); if (s->skip_frame) s->skip_frame = 0; @@ -1185,7 +1184,7 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr, if (!s->packet_loss) decode_frame(s); } else if (s->num_saved_bits - s->frame_offset) { - av_dlog(avctx, AV_LOG_DEBUG, "ignoring %x previously saved bits\n", + av_dlog(avctx, "ignoring %x previously saved bits\n", s->num_saved_bits - s->frame_offset); } |