summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2006-03-24 17:03:49 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2006-03-24 17:03:49 +0000
commitec04d244b50ca0d6c8a87234ed35315e3f3c7ba0 (patch)
tree3af3df1e25dad07330e1745e94d5062c4ebb9c60 /libavformat
parent99487f42b1ad20dd2638114433c3cb029048189d (diff)
let faad init parameters properly, fix many SBR samples
Originally committed as revision 5212 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 3b34fd6490..5eb258e36d 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;
}