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

[jbr]

Author: jbr
Date: Fri Dec 14 06:34:08 2007
New Revision: 1570

Log:
remove some unneeded one-time-use variables

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

Modified: eac3/eac3.h
==============================================================================
--- eac3/eac3.h	(original)
+++ eac3/eac3.h	Fri Dec 14 06:34:08 2007
@@ -52,18 +52,14 @@ 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 mixmdate;                    ///< Mixing meta-data exists
     int dmixmod;                     ///< Preferred stereo downmix mode
-    int lfemixlevcode;               ///< lfe mix level code exists
     int lfemixlevcod;                ///< lfe mix level code
     int pgmscl[2];                   ///< Program scale factor
     int extpgmscl;                   ///< External program scale factor
     int mixdef;                      ///< Mix control type
     int mixdeflen;                   ///< Length of mixing parameter data field
     int paninfo[2];                  ///< Pan information
-    int frmmixcfginfoe;              ///< Frame mixing configuration information exists
     int blkmixcfginfo[6];            ///< Block mixing configuration information
-    int infomdate;                   ///< Informational meta-data exists
 ///@}
 ///@name Audio Frame
 ///@{

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Fri Dec 14 06:34:08 2007
@@ -405,8 +405,7 @@ static int parse_bsi(GetBitContext *gbc,
         s->downmix_coeffs[i][1] = mixlevels[eac3_default_coeffs[s->channel_mode][i][1]];
     }
 
-    s->mixmdate = get_bits1(gbc);
-    if (s->mixmdate) {
+    if (get_bits1(gbc)) {
         /* Mixing metadata */
         if (s->channel_mode > 2) {
             /* if more than 2 channels */
@@ -433,8 +432,7 @@ static int parse_bsi(GetBitContext *gbc,
         }
         if (s->lfe_on) {
             /* if the LFE channel exists */
-            s->lfemixlevcode = get_bits1(gbc);
-            if (s->lfemixlevcode) {
+            if (get_bits1(gbc)) {
                 s->lfemixlevcod = get_bits(gbc, 5);
             }
         }
@@ -474,8 +472,7 @@ static int parse_bsi(GetBitContext *gbc,
                         }
                     }
                 }
-                s->frmmixcfginfoe = get_bits1(gbc);
-                if (s->frmmixcfginfoe) {
+                if (get_bits1(gbc)) {
                     /* mixing configuration information */
                     if (s->num_blocks == 1) {
                         s->blkmixcfginfo[0] = get_bits(gbc, 5);
@@ -490,8 +487,7 @@ static int parse_bsi(GetBitContext *gbc,
             }
         }
     }
-    s->infomdate = get_bits1(gbc);
-    if (s->infomdate) {
+    if (get_bits1(gbc)) {
         /* Informational metadata */
         skip_bits(gbc, 3); //skip Bit stream mode
         skip_bits(gbc, 2); //skip copyright bit and original bitstream bit