Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / mov.c

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2d733264e66cca7c20f6fe0a0448056afa7e61ef..6c78adbd2a1a044aa8ce193518d2d33470cbfef1 100644 (file)
--- 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: