From e9ca0b1522a799e9d52e6aafc58fc316398f40b6 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 23 Apr 2015 19:21:17 +0200
Subject: demux_mkv: move global options to the demuxer

The options don't change, but they're now declared and used privately by
demux_mkv.c. This also brings with it a minor refactor of the subpreroll
seek handling - merge the code from playloop.c into demux_mkv.c. The
change in demux.c is pretty much equivalent as well.
---
 player/playloop.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'player')

diff --git a/player/playloop.c b/player/playloop.c
index 1c10c3e962..c34ae7e6da 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -240,8 +240,6 @@ static int mp_seek(MPContext *mpctx, struct seek_params seek,
     }
     if (hr_seek)
         demuxer_style |= SEEK_HR;
-    if (hr_seek || opts->mkv_subtitle_preroll)
-        demuxer_style |= SEEK_SUBPREROLL;
 
     if (hr_seek)
         demuxer_amount -= hr_seek_offset;
-- 
cgit v1.2.3