summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-08-12 23:08:48 +0200
committerwm4 <wm4@nowhere>2017-08-12 23:10:40 +0200
commitf1d161d55f458cf47e63d1ab9ddf08859019dd8a (patch)
treeccd0fad41aefdf59b9ec00652edc829c3f81a424 /options
parentbaead23ea06307af0d0a7acd21307d8f723b3a1b (diff)
downloadmpv-f1d161d55f458cf47e63d1ab9ddf08859019dd8a.tar.bz2
mpv-f1d161d55f458cf47e63d1ab9ddf08859019dd8a.tar.xz
player: make --lavfi-complex changeable at runtime
Tends to be somewhat glitchy if subtitles are enabled, and you enable and disable tracks. On error, this will disable --lavfi-complex, which will result in whatever behavior.
Diffstat (limited to 'options')
-rw-r--r--options/m_option.h3
-rw-r--r--options/options.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/options/m_option.h b/options/m_option.h
index 6935c93594..5feed14542 100644
--- a/options/m_option.h
+++ b/options/m_option.h
@@ -408,7 +408,8 @@ struct m_option {
#define UPDATE_PRIORITY (1 << 15) // --priority (Windows-only)
#define UPDATE_SCREENSAVER (1 << 16) // --stop-screensaver
#define UPDATE_VOL (1 << 17) // softvol related options
-#define UPDATE_OPT_LAST (1 << 17)
+#define UPDATE_LAVFI_COMPLEX (1 << 18) // --lavfi-complex
+#define UPDATE_OPT_LAST (1 << 18)
// All bits between _FIRST and _LAST (inclusive)
#define UPDATE_OPTS_MASK \
diff --git a/options/options.c b/options/options.c
index b13d9e5803..30249467aa 100644
--- a/options/options.c
+++ b/options/options.c
@@ -362,7 +362,7 @@ const m_option_t mp_opts[] = {
OPT_STRINGLIST("alang", stream_lang[STREAM_AUDIO], 0),
OPT_STRINGLIST("slang", stream_lang[STREAM_SUB], 0),
- OPT_STRING("lavfi-complex", lavfi_complex, 0),
+ OPT_STRING("lavfi-complex", lavfi_complex, UPDATE_LAVFI_COMPLEX),
OPT_CHOICE("audio-display", audio_display, 0,
({"no", 0}, {"attachment", 1})),