diff options
author | Daniel Glöckner <daniel-gl@gmx.net> | 2017-08-06 03:04:53 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-09-01 00:56:32 +0200 |
commit | feb1dbc7bd4c395400c48055c563ac23d5251716 (patch) | |
tree | a4119229f5f72e9a0e2a86df7afb8f57fdd7bb5b /libavformat/mov.c | |
parent | f1e47f87131dd7c3718496b83911e17586e26e80 (diff) | |
download | ffmpeg-feb1dbc7bd4c395400c48055c563ac23d5251716.tar.gz |
avformat/mov: prevent duplication of first fragment's ctts_data
MP4 files with fragments might have the first moof box that is mentioned
in a fragment index before the first mdat box. Since it is then already
parsed by mov_read_header, we have to make sure that mov_switch_root
will not parse it again when seeking by setting the headers_read flag in
the index. Parsing it a second time would cause the ctts_data array to
receive a second copy of the information from the trun box, leading to
wrong PTS values for the second and following fragments in presence of
B-frames.
Fixes ticket 6560.
Signed-off-by: Daniel Glöckner <daniel-gl@gmx.net>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r-- | libavformat/mov.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 89b2af7597..994e9c6eba 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6363,6 +6363,13 @@ static int mov_read_header(AVFormatContext *s) } ff_configure_buffers_for_index(s, AV_TIME_BASE); + for (i = 0; i < mov->fragment_index_count; i++) { + MOVFragmentIndex *idx = mov->fragment_index_data[i]; + for (j = 0; j < idx->item_count; j++) + if (idx->items[j].moof_offset <= mov->fragment.moof_offset) + idx->items[j].headers_read = 1; + } + return 0; } |