ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sat Jun 15 00:12:36 2019 +0200| [696312c487d9d8c49a087017a829d1cdcbd68651] | committer: Michael Niedermayer
avformat/mov: Set fragment.found_tfhd only after TFHD has been parsed Fixes: Assertion failure Fixes: crbug971646.mp4 Reported-by: Matt Wolenetz <wolen...@google.com> Reviewed-by: Matt Wolenetz <wolen...@google.com> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=696312c487d9d8c49a087017a829d1cdcbd68651 --- libavformat/mov.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 78f692872b..327a25bbdf 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4562,8 +4562,6 @@ static int mov_read_tfhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) MOVTrackExt *trex = NULL; int flags, track_id, i; - c->fragment.found_tfhd = 1; - avio_r8(pb); /* version */ flags = avio_rb24(pb); @@ -4579,6 +4577,7 @@ static int mov_read_tfhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_WARNING, "could not find corresponding trex (id %u)\n", track_id); return 0; } + c->fragment.found_tfhd = 1; frag->track_id = track_id; set_frag_stream(&c->frag_index, track_id); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
