diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-15 00:12:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-25 13:30:09 +0200 |
| commit | 696312c487d9d8c49a087017a829d1cdcbd68651 (patch) | |
| tree | 24e978bbea9d5cd16c1823c9b4b548df2d34431e /libavformat/mov.c | |
| parent | bd3672ba75c7e4a4b0cb2b46b8b6c983d73a0107 (diff) | |
| download | ffmpeg-696312c487d9d8c49a087017a829d1cdcbd68651.tar.gz | |
avformat/mov: Set fragment.found_tfhd only after TFHD has been parsed
Fixes: Assertion failure
Fixes: crbug971646.mp4
Reported-by: Matt Wolenetz <wolenetz@google.com>
Reviewed-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 1 insertions, 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); |