From 0619b75cb137128a692056d40ffed088f8730da2 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 8 Nov 2010 05:18:48 +0200 Subject: demux_mkv: fix relative seeks without index Relative seeks didn't add the current position as they should. Fix. Note that this had no effect in normal playback case even if the file had no index, because the "accurate_seek" logic at higher level would convert all commands to absolute seeks before calling demuxer level. --- libmpdemux/demux_mkv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libmpdemux/demux_mkv.c') diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index bc9607769f..6f2d121f03 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -2522,12 +2522,12 @@ static void demux_mkv_seek(demuxer_t *demuxer, float rel_seek_secs, if (!(flags & SEEK_FACTOR)) { /* time in secs */ mkv_index_t *index = NULL; stream_t *s = demuxer->stream; - int64_t target_timecode = 0, diff, min_diff = 0xFFFFFFFFFFFFFFFLL; + int64_t diff, min_diff = 0xFFFFFFFFFFFFFFF; int i; if (!(flags & SEEK_ABSOLUTE)) /* relative seek */ - target_timecode = (int64_t) (mkv_d->last_pts * 1000.0); - target_timecode += (int64_t) (rel_seek_secs * 1000.0); + rel_seek_secs += mkv_d->last_pts; + int64_t target_timecode = rel_seek_secs * 1000.0; if (target_timecode < 0) target_timecode = 0; -- cgit v1.2.3