har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

matroskadec: ensure we only consider chapters which are properly ordered

Browse Source 
Originally committed as revision 16612 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2009-01-15 00:42:57 +00:00
parent 89ac55ada9
commit e0e4be590c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/matroskadec.c
View File

@ -1076,6 +1076,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
EbmlList *index_list; EbmlList *index_list;
MatroskaIndex *index; MatroskaIndex *index;
int index_scale = 1; int index_scale = 1;
uint64_t max_start = 0;
Ebml ebml = { 0 }; Ebml ebml = { 0 };
AVStream *st; AVStream *st;
int i, j; int i, j;
@ -1365,10 +1366,13 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
chapters = chapters_list->elem; chapters = chapters_list->elem;
for (i=0; i<chapters_list->nb_elem; i++) 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}, ff_new_chapter(s, chapters[i].uid, (AVRational){1, 1000000000},
chapters[i].start, chapters[i].end, chapters[i].start, chapters[i].end,
chapters[i].title); chapters[i].title);
max_start = chapters[i].start;
}
index_list = &matroska->index; index_list = &matroska->index;
index = index_list->elem; index = index_list->elem;