diff options
author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-09-26 12:13:53 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-03 21:48:38 +0100 |
commit | c5142a95a51320e65d80d6bca0eb69fcff05508f (patch) | |
tree | 598fb210c550812b96f9aad20dd421cc4d430e0b /libavformat/mov.c | |
parent | def01739c1365a5650b4222d59124132cee4f4fe (diff) | |
download | ffmpeg-c5142a95a51320e65d80d6bca0eb69fcff05508f.tar.gz |
Support more AVC-Intra files
Followup to http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/151321
patch by Reimar and Thomas Mundt fixes some AVC-Intra files from
different tickets.
It does not fix http://samples.ffmpeg.org/ffmpeg-
bugs/trac/ticket524/AVCI50.mov
Authors of this commit are: Reimar and Thomas Mundt
Patch and commit message mostly taken from ffmpeg-devel, mail by Carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 2d733264e6..6c78adbd2a 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2251,6 +2251,12 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) #endif } + // done for ai5q, ai52, ai55, ai1q, ai12 and ai15. + if (!st->codec->extradata_size && st->codec->codec_id == AV_CODEC_ID_H264 && + st->codec->codec_tag != MKTAG('a', 'v', 'c', '1')) { + ff_generate_avci_extradata(st); + } + switch (st->codec->codec_id) { #if CONFIG_H261_DECODER case AV_CODEC_ID_H261: |