[FFmpeg-cvslog] r18169 - trunk/libavcodec/aac.c

[alexc]

Author: alexc
Date: Mon Mar 23 06:13:26 2009
New Revision: 18169

Log:
AAC: Ignore cc_domain for independent (time domain) coupling.

Modified:
   trunk/libavcodec/aac.c

Modified: trunk/libavcodec/aac.c
==============================================================================
--- trunk/libavcodec/aac.c	Mon Mar 23 00:42:06 2009	(r18168)
+++ trunk/libavcodec/aac.c	Mon Mar 23 06:13:26 2009	(r18169)
@@ -1199,14 +1199,7 @@ static int decode_cce(AACContext * ac, G
         } 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));