From 3d10a8904d638b10036228f439755e79a15e02d4 Mon Sep 17 00:00:00 2001 From: Jai Menon Date: Tue, 21 Apr 2009 17:52:52 +0000 Subject: [PATCH] Read extended channel configuration when extended AOT is BSAC. Originally committed as revision 18644 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpeg4audio.c | 2 ++ libavcodec/mpeg4audio.h | 1 + 2 files changed, 3 insertions(+) diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index 792f41d9e..91ea2b7c9 100644 --- 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 70076e7e8..b149362f0 100644 --- 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]; -- 2.11.0