From e0e4be590ce1f8aac1d7b9f930049dfb67e0d15c Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Thu, 15 Jan 2009 00:42:57 +0000
Subject: [PATCH] matroskadec: ensure we only consider chapters which are
properly ordered
Originally committed as revision 16612 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/matroskadec.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index e23d03b897f..e239a557e93 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1076,6 +1076,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
EbmlList *index_list;
MatroskaIndex *index;
int index_scale = 1;
+ uint64_t max_start = 0;
Ebml ebml = { 0 };
AVStream *st;
int i, j;
@@ -1365,10 +1366,13 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
chapters = chapters_list->elem;
for (i=0; i<chapters_list->nb_elem; i++)
- if (chapters[i].start != AV_NOPTS_VALUE && chapters[i].uid)
+ if (chapters[i].start != AV_NOPTS_VALUE && chapters[i].uid
+ && (max_start==0 || chapters[i].start > max_start)) {
ff_new_chapter(s, chapters[i].uid, (AVRational){1, 1000000000},
chapters[i].start, chapters[i].end,
chapters[i].title);
+ max_start = chapters[i].start;
+ }
index_list = &matroska->index;
index = index_list->elem;
--
GitLab