[FFmpeg-soc] [soc]: r3551 - eac3/ac3dec.c

[jbr]

Author: jbr
Date: Sat Aug 23 04:23:19 2008
New Revision: 3551

Log:
simplify check for coupling strategy

Modified:
   eac3/ac3dec.c

Modified: eac3/ac3dec.c
==============================================================================
--- eac3/ac3dec.c	(original)
+++ eac3/ac3dec.c	Sat Aug 23 04:23:19 2008
@@ -314,6 +314,7 @@ static int parse_frame_header(AC3DecodeC
         s->first_cpl_leak        = 0;
         s->dba_syntax            = 1;
         s->skip_syntax           = 1;
+        memset(s->cpl_strategy_exists, 0, sizeof(s->cpl_strategy_exists));
         memset(s->channel_uses_aht, 0, sizeof(s->channel_uses_aht));
         return ac3_parse_header(s);
     } else {
@@ -770,9 +771,7 @@ static int decode_audio_block(AC3DecodeC
     /* TODO: spectral extension coordinates */
 
     /* coupling strategy */
-    if (!s->eac3)
-        s->cpl_strategy_exists[blk] = get_bits1(gbc);
-    if (s->cpl_strategy_exists[blk]) {
+    if (s->cpl_strategy_exists[blk] || (!s->eac3 && get_bits1(gbc))) {
         memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS);
         if (!s->eac3)
             s->cpl_in_use[blk] = get_bits1(gbc);