[FFmpeg-cvslog] r18644 - in trunk/libavcodec: mpeg4audio.c mpeg4audio.h

[jai_menon]

Author: jai_menon
Date: Tue Apr 21 19:52:52 2009
New Revision: 18644

Log:
Read extended channel configuration when extended AOT is BSAC.

Modified:
   trunk/libavcodec/mpeg4audio.c
   trunk/libavcodec/mpeg4audio.h

Modified: trunk/libavcodec/mpeg4audio.c
==============================================================================
--- trunk/libavcodec/mpeg4audio.c	Tue Apr 21 19:37:03 2009	(r18643)
+++ trunk/libavcodec/mpeg4audio.c	Tue Apr 21 19:52:52 2009	(r18644)
@@ -61,6 +61,8 @@ int ff_mpeg4audio_get_config(MPEG4AudioC
         c->sbr = 1;
         c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index);
         c->object_type = get_object_type(&gb);
+        if (c->object_type == AOT_ER_BSAC)
+            c->ext_chan_config = get_bits(&gb, 4);
     } else {
         c->ext_object_type = 0;
         c->ext_sample_rate = 0;

Modified: trunk/libavcodec/mpeg4audio.h
==============================================================================
--- trunk/libavcodec/mpeg4audio.h	Tue Apr 21 19:37:03 2009	(r18643)
+++ trunk/libavcodec/mpeg4audio.h	Tue Apr 21 19:52:52 2009	(r18644)
@@ -33,6 +33,7 @@ typedef struct {
     int ext_object_type;
     int ext_sampling_index;
     int ext_sample_rate;
+    int ext_chan_config;
 } MPEG4AudioConfig;
 
 extern const int ff_mpeg4audio_sample_rates[16];