From e9ca0b1522a799e9d52e6aafc58fc316398f40b6 Mon Sep 17 00:00:00 2001 From: wm4 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. --- options/options.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'options/options.h') 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; -- cgit v1.2.3