diff options
| author | wm4 <wm4@nowhere> | 2016-10-22 16:39:24 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-10-22 16:39:24 +0200 |
| commit | 1bf474e19afac869f643de0f51befdaed2872d23 (patch) | |
| tree | 8a21e4db6f01850fed063c4ca0265a6bfbc74cf4 /options | |
| parent | bf5c4c42fa4366b707234e8feb5036ca3c03f056 (diff) | |
| download | mpv-1bf474e19afac869f643de0f51befdaed2872d23.tar.bz2 mpv-1bf474e19afac869f643de0f51befdaed2872d23.tar.xz | |
options: make --load-scripts runtime changeable
Just that actually changing it at runtime won't do anything.
This deals with a nasty initialization order issue with encoding.
Encoding is initialized after options have initialized, but before
--load-scripts is checked and executed. Encoding initialization accesses
FFmpeg API, thus it has to run after FFmpeg is initialized (which also
implies it's initialized after options/logging init). On the other hand,
it sets the encoding builtin profile, which possibly sets --load-scripts
to "no". That failed at this point because --load-scripts was marked as
fixed.
Just marking it as not fixed gets rid of the headache, even if it's not
perfectly orthodox.
Diffstat (limited to 'options')
| -rw-r--r-- | options/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/options/options.c b/options/options.c index f97ce5362b..7a4deae776 100644 --- a/options/options.c +++ b/options/options.c @@ -302,7 +302,7 @@ const m_option_t mp_opts[] = { OPT_FLAG("ytdl", lua_load_ytdl, UPDATE_BUILTIN_SCRIPTS), OPT_STRING("ytdl-format", lua_ytdl_format, 0), OPT_KEYVALUELIST("ytdl-raw-options", lua_ytdl_raw_options, 0), - OPT_FLAG("load-scripts", auto_load_scripts, M_OPT_FIXED), + OPT_FLAG("load-scripts", auto_load_scripts, 0), #endif // ------------------------- stream options -------------------- |