Commit feb1dbc7 authored by Daniel Glöckner's avatar Daniel Glöckner Committed by Michael Niedermayer

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: 's avatarDaniel Glöckner <daniel-gl@gmx.net>
Reviewed-by: 's avatarDale Curtis <dalecurtis@chromium.org>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent f1e47f87
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment