diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-09 11:37:30 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-09 11:37:30 +0000 |
| commit | cbee7a69448467ca615a53fd3927b53b1547509d (patch) | |
| tree | fb82a9365866806832a994ff7932c8d9e06c8d2f /libavformat/avidec.c | |
| parent | 6c4d16556b96dae18977fddad3a43faaed579993 (diff) | |
| download | ffmpeg-cbee7a69448467ca615a53fd3927b53b1547509d.tar.gz | |
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
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 457cda87d5..dfbe5c6ef7 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) |