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

[jbr]

Author: jbr
Date: Tue Aug  5 05:54:42 2008
New Revision: 3037

Log:
merge the two E-AC-3 header parsing functions

Modified:
   eac3/eac3dec.c

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Tue Aug  5 05:54:42 2008
@@ -166,9 +166,12 @@ void ff_eac3_get_transform_coeffs_aht_ch
     }
 }
 
-static int parse_bsi(AC3DecodeContext *s)
+int ff_eac3_parse_header(AC3DecodeContext *s)
 {
-    int i, blk;
+    int i, blk, ch;
+    int ac3_exponent_strategy, parse_aht_info, parse_spx_atten_data;
+    int parse_transient_proc_info;
+    int num_cpl_blocks;
     GetBitContext *gbc = &s->gbc;
 
     /* an E-AC-3 stream can have multiple independent streams which the
@@ -329,17 +332,7 @@ static int parse_bsi(AC3DecodeContext *s
         }
     }
 
-    return 0;
-}
-
 /** Audio frame syntax flags, strategy data, and per-frame data */
-static int parse_audfrm(AC3DecodeContext *s)
-{
-    int blk, ch;
-    int ac3_exponent_strategy, parse_aht_info, parse_spx_atten_data;
-    int parse_transient_proc_info;
-    int num_cpl_blocks;
-    GetBitContext *gbc = &s->gbc;
 
     if (s->num_blocks == 6) {
         /* LUT-based exponent strategy syntax */
@@ -487,11 +480,3 @@ static int parse_audfrm(AC3DecodeContext
 
     return 0;
 }
-
-int ff_eac3_parse_header(AC3DecodeContext *s)
-{
-    int err = parse_bsi(s);
-    if (!err)
-        err = parse_audfrm(s);
-    return err;
-}