Add a channels field to MPEG4AudioConfig.

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

1 files changed, 1 insertions, 3 deletions

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index b3b3cc1930..27062dcb97 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -410,9 +410,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
                 MPEG4AudioConfig cfg;
                 ff_mpeg4audio_get_config(&cfg, st->codec->extradata,
                                          st->codec->extradata_size);
-                if (cfg.chan_config > 7)
-                    return -1;
-                st->codec->channels = ff_mpeg4audio_channels[cfg.chan_config];
+                st->codec->channels = cfg.channels;
                 st->codec->sample_rate = cfg.sample_rate;
                 dprintf(s, "mp4a config channels %d sample rate %d\n",
                         st->codec->channels, st->codec->sample_rate);