[SCM] libav/experimental: aac chan config is 0 if bitstream contains program_config_element

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:21:59 UTC 2013


The following commit has been merged in the experimental branch:
commit 391872e467a1e72d78fbf6edf57ce1d528e744b6
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon May 26 21:52:54 2008 +0000

    aac chan config is 0 if bitstream contains program_config_element
    
    Originally committed as revision 13437 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index eca6a41..86a3e0b 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -408,7 +408,7 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
                 MPEG4AudioConfig cfg;
                 ff_mpeg4audio_get_config(&cfg, st->codec->extradata,
                                          st->codec->extradata_size);
-                if (!cfg.chan_config || cfg.chan_config > 7)
+                if (cfg.chan_config > 7)
                     return -1;
                 st->codec->channels = ff_mpeg4audio_channels[cfg.chan_config];
                 if (cfg.object_type == 29 && cfg.sampling_index < 3) // old mp3on4

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list