From cbee7a69448467ca615a53fd3927b53b1547509d Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Thu, 9 Nov 2006 11:37:30 +0000 Subject: get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used Originally committed as revision 6954 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avidec.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavformat/avidec.c') diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 457cda8..dfbe5c6 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -443,6 +443,9 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) /* special case time: To support Xan DPCM, hardcode * the format if Xxan is the video codec */ st->need_parsing = 1; + /* ADTS header is in extradata, AAC without header must be stored as exact frames, parser not needed and it will fail */ + if (st->codec->codec_id == CODEC_ID_AAC && st->codec->extradata_size) + st->need_parsing = 0; /* force parsing as several audio frames can be in one packet */ if (xan_video) -- cgit v1.1