From 8f569ed08faa39414ebd65c2e530a87dc9007d5b Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sat, 15 Nov 2008 15:34:51 +0000 Subject: matroskadec: fix index timestamps for some broken files fix issue697 Originally committed as revision 15829 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroskadec.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'libavformat/matroskadec.c') diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index cedfb3d20d..5a79712f05 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1074,6 +1074,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) MatroskaTrack *tracks; EbmlList *index_list; MatroskaIndex *index; + int index_scale = 1; Ebml ebml = { 0 }; AVStream *st; int i, j; @@ -1369,6 +1370,11 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) index_list = &matroska->index; index = index_list->elem; + if (index_list->nb_elem + && index[0].time > 100000000000000/matroska->time_scale) { + av_log(matroska->ctx, AV_LOG_WARNING, "Working around broken index.\n"); + index_scale = matroska->time_scale; + } for (i=0; inb_elem; i++) { EbmlList *pos_list = &index[i].pos; MatroskaIndexPos *pos = pos_list->elem; @@ -1378,7 +1384,8 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) if (track && track->stream) av_add_index_entry(track->stream, pos[j].pos + matroska->segment_start, - index[i].time, 0, 0, AVINDEX_KEYFRAME); + index[i].time/index_scale, 0, 0, + AVINDEX_KEYFRAME); } } -- cgit v1.2.3