summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-18 23:07:20 +0100
committerwm4 <wm4@nowhere>2014-11-18 23:07:20 +0100
commitd51a032fd773cbee6743d2e0f9dcc7fad65ae4f2 (patch)
treea944184d0144d3cf13e62fdf44c669f2bf39d7cd /options
parentcc84f73a954f10da603982dcc2a8a278b4f5f52c (diff)
downloadmpv-d51a032fd773cbee6743d2e0f9dcc7fad65ae4f2.tar.bz2
mpv-d51a032fd773cbee6743d2e0f9dcc7fad65ae4f2.tar.xz
demux_mkv: add an option for compatibility with Haali
This was requested on IRC.
Diffstat (limited to 'options')
-rw-r--r--options/options.c1
-rw-r--r--options/options.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/options/options.c b/options/options.c
index 93b660b0fd..1f6e0ae377 100644
--- a/options/options.c
+++ b/options/options.c
@@ -306,6 +306,7 @@ const m_option_t mp_opts[] = {
OPT_FLAG("mkv-subtitle-preroll", mkv_subtitle_preroll, 0), // old alias
OPT_DOUBLE("demuxer-mkv-subtitle-preroll-secs", mkv_subtitle_preroll_secs,
M_OPT_MIN, .min = 0),
+ OPT_FLAG("demuxer-mkv-probe-video-duration", mkv_probe_duration, 0),
// ------------------------- subtitles options --------------------
diff --git a/options/options.h b/options/options.h
index 63f77b2b3a..94d78ac6a0 100644
--- a/options/options.h
+++ b/options/options.h
@@ -196,6 +196,7 @@ typedef struct MPOpts {
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;