[FFmpeg-soc] [soc]: r1575 - eac3/eac3dec.c

[jbr]

Author: jbr
Date: Fri Dec 14 22:58:25 2007
New Revision: 1575

Log:
fix parsing of mixing metadata

Modified:
   eac3/eac3dec.c

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Fri Dec 14 22:58:25 2007
@@ -452,17 +452,14 @@ static int parse_bsi(GetBitContext *gbc,
             if (s->mixdef == 1) {
                 /* mixing option 2 */
                 skip_bits(gbc, 5);
-            } else {
-                if (s->mixdef == 2) {
+            } else if (s->mixdef == 2) {
                     /* mixing option 3 */
                     skip_bits(gbc, 12);
-                } else {
-                    if (s->mixdef == 3) {
+            } else if (s->mixdef == 3) {
                         /* mixing option 4 */
                         s->mixdeflen = get_bits(gbc, 5);
                         skip_bits(gbc, 8*(s->mixdeflen+2));
-                    }
-                }
+            }
                 if (s->channel_mode < 2) {
                     /* if mono or dual mono source */
                     for (i = 0; i < (s->channel_mode ? 1 : 2); i++) {
@@ -485,7 +482,6 @@ static int parse_bsi(GetBitContext *gbc,
                         }
                     }
                 }
-            }
         }
     }
     if (get_bits1(gbc)) {