From 5aea268d14b2973188589c89b275d8b248150446 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Wed, 11 Nov 2009 20:24:23 +0000 Subject: Add a channels field to MPEG4AudioConfig. Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mov.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libavformat/mov.c') diff --git a/libavformat/mov.c b/libavformat/mov.c index 3d676308f9..196f41d1b4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -434,9 +434,7 @@ int ff_mov_read_esds(AVFormatContext *fc, ByteIOContext *pb, MOVAtom atom) 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; if (cfg.object_type == 29 && cfg.sampling_index < 3) // old mp3on4 st->codec->sample_rate = ff_mpa_freq_tab[cfg.sampling_index]; else -- cgit v1.2.3