[FFmpeg-soc] [soc]: r1579 - in eac3: eac3.h eac3dec.c

[jbr]

Author: jbr
Date: Sat Dec 15 01:36:44 2007
New Revision: 1579

Log:
skip unused mixing configuration info and remove variable from decoding context

Modified:
   eac3/eac3.h
   eac3/eac3dec.c

Modified: eac3/eac3.h
==============================================================================
--- eac3/eac3.h	(original)
+++ eac3/eac3.h	Sat Dec 15 01:36:44 2007
@@ -52,7 +52,6 @@ typedef struct EAC3Context{
     int lfe_on;                      ///< Low frequency effect channel on (lfeon)
     int bitstream_id;                ///< Bit stream identification (bsid)
     float dialog_norm[2];            ///< Dialogue normalization (dialnorm)
-    int blkmixcfginfo[6];            ///< Block mixing configuration information
 ///@}
 ///@name Audio Frame
 ///@{

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Sat Dec 15 01:36:44 2007
@@ -466,14 +466,14 @@ static int parse_bsi(GetBitContext *gbc,
                     }
                 }
             }
+            /* skip mixing configuration information */
             if (get_bits1(gbc)) {
-                /* mixing configuration information */
                 if (s->num_blocks == 1) {
-                    s->blkmixcfginfo[0] = get_bits(gbc, 5);
+                    skip_bits(gbc, 5);
                 } else {
                     for (blk = 0; blk < s->num_blocks; blk++) {
                         if (get_bits1(gbc)) {
-                            s->blkmixcfginfo[blk] = get_bits(gbc, 5);
+                            skip_bits(gbc, 5);
                         }
                     }
                 }