avformat/mov: Fix parsing of tfdt when using sample descriptors.
authorJacob Trimble <modmaker-at-google.com@ffmpeg.org>
Wed, 4 Apr 2018 19:30:56 +0000 (12:30 -0700)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 5 Apr 2018 18:10:24 +0000 (20:10 +0200)
Signed-off-by: Jacob Trimble <modmaker@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mov.c

index e7c32e6..97b1462 100644 (file)
@@ -4601,7 +4601,7 @@ static int mov_read_tfdt(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         return AVERROR_INVALIDDATA;
     }
     sc = st->priv_data;
-    if (sc->pseudo_stream_id + 1 != frag->stsd_id)
+    if (sc->pseudo_stream_id + 1 != frag->stsd_id && sc->pseudo_stream_id != -1)
         return 0;
     version = avio_r8(pb);
     avio_rb24(pb); /* flags */