[SCM] libav/experimental: 10l: fix error in commit r13382
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:21:42 UTC 2013
The following commit has been merged in the experimental branch:
commit 43ad93a4f1289da5465f8f07bd46739ed4abbd22
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Sun May 25 16:19:44 2008 +0000
10l: fix error in commit r13382
Originally committed as revision 13384 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 8abbab9..3a31ed8 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -988,7 +988,8 @@ static int ac3_parse_audio_block(AC3DecodeContext *s, int blk)
}
/* coupling leak information */
- if (s->cpl_in_use && get_bits1(gbc)) {
+ if (s->cpl_in_use) {
+ if (get_bits1(gbc)) {
s->bit_alloc_params.cpl_fast_leak = get_bits(gbc, 3);
s->bit_alloc_params.cpl_slow_leak = get_bits(gbc, 3);
bit_alloc_stages[CPL_CH] = FFMAX(bit_alloc_stages[CPL_CH], 2);
@@ -996,6 +997,7 @@ static int ac3_parse_audio_block(AC3DecodeContext *s, int blk)
av_log(s->avctx, AV_LOG_ERROR, "new coupling leak info must be present in block 0\n");
return -1;
}
+ }
/* delta bit allocation information */
if (get_bits1(gbc)) {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list