diff options
| author | wm4 <wm4@nowhere> | 2016-09-17 17:04:13 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-09-17 17:04:13 +0200 |
| commit | 7fa26bfd9c2c927e8f90089f2fe1822c72ea11d0 (patch) | |
| tree | e9db3ad20f998880d74950e080f7f7fd475337d9 /options/options.c | |
| parent | 4395a4f83709a538538cee9d14de522c024b1713 (diff) | |
| download | mpv-7fa26bfd9c2c927e8f90089f2fe1822c72ea11d0.tar.bz2 mpv-7fa26bfd9c2c927e8f90089f2fe1822c72ea11d0.tar.xz | |
options: kill M_OPT_GLOBAL flag
This meant "cannot be used as per-file option" (wrt. playlist items).
Doesn't make too much sense anymore, especially given how obscure
per-file options are.
Diffstat (limited to 'options/options.c')
| -rw-r--r-- | options/options.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/options/options.c b/options/options.c index d3b9c44341..f2e7c863e2 100644 --- a/options/options.c +++ b/options/options.c @@ -277,11 +277,11 @@ const m_option_t mp_opts[] = { OPT_FLAG("config", load_config, CONF_GLOBAL | CONF_PRE_PARSE), OPT_STRING("config-dir", force_configdir, CONF_GLOBAL | CONF_NOCFG | CONF_PRE_PARSE), - OPT_STRINGLIST("reset-on-next-file", reset_options, M_OPT_GLOBAL), + OPT_STRINGLIST("reset-on-next-file", reset_options, 0), #if HAVE_LUA OPT_STRINGLIST("script", script_files, CONF_GLOBAL | M_OPT_FILE), - OPT_KEYVALUELIST("script-opts", script_opts, M_OPT_GLOBAL), + OPT_KEYVALUELIST("script-opts", script_opts, 0), OPT_FLAG("osc", lua_load_osc, CONF_GLOBAL), OPT_FLAG("ytdl", lua_load_ytdl, CONF_GLOBAL), OPT_STRING("ytdl-format", lua_ytdl_format, CONF_GLOBAL), @@ -650,7 +650,7 @@ const m_option_t mp_opts[] = { OPT_FLAG("input-terminal", consolecontrols, CONF_GLOBAL), - OPT_STRING("input-file", input_file, M_OPT_FILE | M_OPT_GLOBAL), + OPT_STRING("input-file", input_file, M_OPT_FILE), OPT_STRING("input-ipc-server", ipc_path, M_OPT_FILE | M_OPT_FIXED), OPT_SUBSTRUCT("screenshot", screenshot_image_opts, screenshot_conf, 0), |