[FFmpeg-cvslog] matroska_read_seek: Fix used streams for subtitle index compensation
Michael Niedermayer
git at videolan.org
Thu Aug 29 00:48:56 CEST 2013
ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni at gmx.at> | Mon May 20 04:00:30 2013 +0200| [51daca6c5776a3f00bfdd618a60dab322a85d7d3] | committer: Michael Niedermayer
matroska_read_seek: Fix used streams for subtitle index compensation
Might fix Ticket1907 (I have no testcase so i cant test)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4758e32a6c48044f77102a49110c79b4f338f648)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=51daca6c5776a3f00bfdd618a60dab322a85d7d3
---
libavformat/matroskadec.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 5783aca..2663158 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2406,10 +2406,11 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index,
if (tracks[i].type == MATROSKA_TRACK_TYPE_SUBTITLE
&& !tracks[i].stream->discard != AVDISCARD_ALL) {
index_sub = av_index_search_timestamp(tracks[i].stream, st->index_entries[index].timestamp, AVSEEK_FLAG_BACKWARD);
- if (index_sub >= 0
- && st->index_entries[index_sub].pos < st->index_entries[index_min].pos
- && st->index_entries[index].timestamp - st->index_entries[index_sub].timestamp < 30000000000/matroska->time_scale)
- index_min = index_sub;
+ while(index_sub >= 0
+ && index_min >= 0
+ && tracks[i].stream->index_entries[index_sub].pos < st->index_entries[index_min].pos
+ && st->index_entries[index].timestamp - tracks[i].stream->index_entries[index_sub].timestamp < 30000000000/matroska->time_scale)
+ index_min--;
}
}
More information about the ffmpeg-cvslog
mailing list