Read extended channel configuration when extended AOT is BSAC.

Originally committed as revision 18644 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c
index 792f41d..91ea2b7 100644 (file)
--- a/libavcodec/mpeg4audio.c
+++ b/libavcodec/mpeg4audio.c
@@ -61,6 +61,8 @@ int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si
         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;

diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h
index 70076e7..b149362 100644 (file)
--- a/libavcodec/mpeg4audio.h
+++ b/libavcodec/mpeg4audio.h
@@ -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];