[SCM] libav/experimental: AAC: Ignore cc_domain for independent (time domain) coupling.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 04964ee8bbdc3188fd6a0b610aed000ff2becca4
Author: Alex Converse <alex.converse at gmail.com>
Date:   Mon Mar 23 05:13:26 2009 +0000

    AAC: Ignore cc_domain for independent (time domain) coupling.
    
    Originally committed as revision 18169 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index 9b230a5..dcd560d 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));

-- 
Libav/FFmpeg packaging