diff options
| author | Alex Converse <alex.converse@gmail.com> | 2009-03-23 05:13:26 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2009-03-23 05:13:26 +0000 |
| commit | 04964ee8bbdc3188fd6a0b610aed000ff2becca4 (patch) | |
| tree | c28cd0ee021c020a8bdab9bf2d395e742ac269c9 | |
| parent | 620bba1653f3d6bf0cba0e64eb6b1d2b05fb1dec (diff) | |
| download | ffmpeg-04964ee8bbdc3188fd6a0b610aed000ff2becca4.tar.gz | |
AAC: Ignore cc_domain for independent (time domain) coupling.
Originally committed as revision 18169 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/aac.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c index 9b230a5c5d..dcd560d0cc 100644 --- a/libavcodec/aac.c +++ b/libavcodec/aac.c @@ -1199,14 +1199,7 @@ static int decode_cce(AACContext * ac, GetBitContext * gb, ChannelElement * che) } else coup->ch_select[c] = 2; } - coup->coupling_point += get_bits1(gb); - - if (coup->coupling_point == 2) { - av_log(ac->avccontext, AV_LOG_ERROR, - "Independently switched CCE with 'invalid' domain signalled.\n"); - memset(coup, 0, sizeof(ChannelCoupling)); - return -1; - } + coup->coupling_point += get_bits1(gb) || (coup->coupling_point>>1); sign = get_bits(gb, 1); scale = pow(2., pow(2., (int)get_bits(gb, 2) - 3)); |