diff options
Diffstat (limited to 'options')
| -rw-r--r-- | options/options.c | 6 | ||||
| -rw-r--r-- | options/options.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/options/options.c b/options/options.c index f1bdfde4f8..e3afe5ab14 100644 --- a/options/options.c +++ b/options/options.c @@ -127,8 +127,8 @@ const m_option_t mp_opts[] = { OPT_STRINGLIST("reset-on-next-file", reset_options, M_OPT_GLOBAL), #if HAVE_LUA - OPT_STRINGLIST("lua", lua_files, CONF_GLOBAL | M_OPT_FILE), - OPT_KEYVALUELIST("lua-opts", lua_opts, M_OPT_GLOBAL), + OPT_STRINGLIST("script", script_files, CONF_GLOBAL | M_OPT_FILE), + OPT_KEYVALUELIST("script-opts", script_opts, M_OPT_GLOBAL), 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), @@ -594,6 +594,8 @@ const m_option_t mp_opts[] = { OPT_REMOVED("lavdopts", "use --vd-lavc-..."), OPT_REMOVED("lavfdopts", "use --demuxer-lavf-..."), OPT_REPLACED("lircconf", "input-lirc-conf"), + OPT_REPLACED("lua", "script"), + OPT_REPLACED("lua-opts", "script-opts"), OPT_REMOVED("mixer-channel", "use AO suboptions (alsa, oss)"), OPT_REMOVED("mixer", "use AO suboptions (alsa, oss)"), OPT_REPLACED("mouse-movements", "input-cursor"), diff --git a/options/options.h b/options/options.h index a2edf1bb79..21f7c100e6 100644 --- a/options/options.h +++ b/options/options.h @@ -59,8 +59,8 @@ typedef struct MPOpts { int msg_time; char **reset_options; - char **lua_files; - char **lua_opts; + char **script_files; + char **script_opts; int lua_load_osc; int lua_load_ytdl; char *lua_ytdl_format; |