# HG changeset patch # User aurel # Date 1221172937 0 # Node ID 6339a1e029decd32d8d25fefb843bc40ce98b611 # Parent ae2d4ee06a94db05a9c27ffb00913bed04d469d5 matroskadec: prevent seeking before the first keyframe of the reference stream diff -r ae2d4ee06a94 -r 6339a1e029de matroskadec.c --- a/matroskadec.c Thu Sep 11 17:43:44 2008 +0000 +++ b/matroskadec.c Thu Sep 11 22:42:17 2008 +0000 @@ -139,6 +139,7 @@ EbmlList encodings; AVStream *stream; + int64_t first_timecode; int64_t end_timecode; } MatroskaTrack; @@ -1181,6 +1182,7 @@ st = track->stream = av_new_stream(s, 0); if (st == NULL) return AVERROR(ENOMEM); + track->first_timecode = AV_NOPTS_VALUE; if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") && track->codec_priv.size >= 40 @@ -1466,8 +1468,11 @@ if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE && timecode < track->end_timecode) is_keyframe = 0; /* overlapping subtitles are not key frame */ - if (is_keyframe) + if (is_keyframe) { av_add_index_entry(st, cluster_pos, timecode, 0,0,AVINDEX_KEYFRAME); + if (track->first_timecode == AV_NOPTS_VALUE) + track->first_timecode = timecode; + } track->end_timecode = FFMAX(track->end_timecode, timecode+duration); } @@ -1692,9 +1697,15 @@ MatroskaTrack *tracks = matroska->tracks.elem; AVStream *st = s->streams[stream_index]; int i, index, index_sub, index_min; + int64_t first_timecode = 0; - if (timestamp < 0) - timestamp = 0; + for (i=0; i < matroska->tracks.nb_elem; i++) + if (tracks[i].stream->index == stream_index && + tracks[i].first_timecode != AV_NOPTS_VALUE) + first_timecode = tracks[i].first_timecode; + + if (timestamp < first_timecode) + timestamp = first_timecode; if ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) { if (st->nb_index_entries)