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.

1 files changed, 1 insertions, 3 deletions

diff --git a/options/options.h b/options/options.h
index 24173168e6..c425f8ab6c 100644
--- a/options/options.h
+++ b/options/options.h
@@ -199,9 +199,6 @@ typedef struct MPOpts {
     double demuxer_min_secs;
     char *audio_demuxer_name;
     char *sub_demuxer_name;
-    int mkv_subtitle_preroll;
-    double mkv_subtitle_preroll_secs;
-    int mkv_probe_duration;
 
     double demuxer_min_secs_cache;
     int cache_pausing;
@@ -294,6 +291,7 @@ typedef struct MPOpts {
     struct demux_rawaudio_opts *demux_rawaudio;
     struct demux_rawvideo_opts *demux_rawvideo;
     struct demux_lavf_opts *demux_lavf;
+    struct demux_mkv_opts *demux_mkv;
 
     struct vd_lavc_params *vd_lavc_params;
     struct ad_lavc_params *ad_lavc_params;