From 64bf8455442b229f30fa293c927957fea116335f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 23 May 2014 04:39:55 +0200 Subject: [PATCH] avformat/mov: Dont blindly trust the stream duration in seting chapter times Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 26fb0ed2b4..7f72db973b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3303,6 +3303,11 @@ static void mov_read_chapters(AVFormatContext *s) uint16_t ch; int len, title_len; + if (end < sample->timestamp) { + av_log(s, AV_LOG_WARNING, "ignoring stream duration which is shorter than chapters\n"); + end = AV_NOPTS_VALUE; + } + if (avio_seek(sc->pb, sample->pos, SEEK_SET) != sample->pos) { av_log(s, AV_LOG_ERROR, "Chapter %d not found in file\n", i); goto finish;