[SCM] libav/experimental: let faad init parameters properly, fix many SBR samples

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ec04d244b50ca0d6c8a87234ed35315e3f3c7ba0
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Fri Mar 24 17:03:49 2006 +0000

    let faad init parameters properly, fix many SBR samples
    
    Originally committed as revision 5212 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 3b34fd6..5eb258e 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1134,6 +1134,11 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     if(st->codec->codec_type==CODEC_TYPE_AUDIO && st->codec->sample_rate==0 && sc->time_scale>1) {
         st->codec->sample_rate= sc->time_scale;
     }
+#ifdef CONFIG_FAAD
+    if(st->codec->codec_id ==CODEC_ID_AAC) {
+        st->codec->sample_rate= 0; /* let faad init parameters properly */
+    }
+#endif
 
     return 0;
 }

-- 
Libav/FFmpeg packaging