From 71e73b6c8ead34219eb6d16ede74d161f847826c Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 29 Oct 2014 22:45:21 +0100 Subject: demux: move some seek flag sanitation to generic code No reason why only demux_mkv.c should do this. --- demux/demux_mkv.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'demux/demux_mkv.c') diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index c35ef7ad21..97db573e20 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -2720,13 +2720,7 @@ static void demux_mkv_seek(demuxer_t *demuxer, double rel_seek_secs, int flags) mkv_d->subtitle_preroll = NUM_SUB_PREROLL_PACKETS; if (!st_active[STREAM_SUB] || !st_active[STREAM_VIDEO]) flags &= ~SEEK_SUBPREROLL; - if (!(flags & (SEEK_BACKWARD | SEEK_FORWARD))) { - if (flags & SEEK_ABSOLUTE || rel_seek_secs < 0) { - flags |= SEEK_BACKWARD; - } else { - flags |= SEEK_FORWARD; - } - } + // Adjust the target a little bit to catch cases where the target position // specifies a keyframe with high, but not perfect, precision. rel_seek_secs += flags & SEEK_FORWARD ? -0.005 : 0.005; @@ -2760,9 +2754,7 @@ static void demux_mkv_seek(demuxer_t *demuxer, double rel_seek_secs, int flags) } demux_mkv_fill_buffer(demuxer); - } else if (!(flags & SEEK_ABSOLUTE)) - MP_VERBOSE(demuxer, "seek unsupported flags\n"); - else { + } else { stream_t *s = demuxer->stream; read_deferred_cues(demuxer); -- cgit v1.2.3