diff options
| author | wm4 <wm4@nowhere> | 2014-04-19 22:05:17 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-04-19 22:05:17 +0200 |
| commit | b85983a4a6f52c85651f916bfedb8234c9424634 (patch) | |
| tree | 8d25ec8de84ad597e12c1e7596253739ea951cc8 /options/options.c | |
| parent | 85998f6121edb44672f51c4745fb243f3c567d3f (diff) | |
| download | mpv-b85983a4a6f52c85651f916bfedb8234c9424634.tar.bz2 mpv-b85983a4a6f52c85651f916bfedb8234c9424634.tar.xz | |
encode: don't apply default config options
Often, user configs set options that are not suitable for encoding.
Usually, playback and encoding are pretty different things, so it makes
sense to keep them strictly separate. There are several possible
solutions. The approach taken by this commit is to basically ignore the
default config settings, and switch to an [encoding] config profile
section instead. This also makes it impossible to have --o in a config
file, because --o enables encode mode.
See github issue #727 for discussion.
Diffstat (limited to 'options/options.c')
| -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 509e8a7e2b..646ebc490f 100644 --- a/options/options.c +++ b/options/options.c @@ -619,7 +619,7 @@ const m_option_t mp_opts[] = { OPT_PRINT("V", print_version), #if HAVE_ENCODING - OPT_STRING("o", encode_output.file, CONF_GLOBAL), + OPT_STRING("o", encode_output.file, CONF_GLOBAL | CONF_NOCFG | CONF_PRE_PARSE), OPT_STRING("of", encode_output.format, CONF_GLOBAL), OPT_STRINGLIST("ofopts*", encode_output.fopts, CONF_GLOBAL), OPT_FLOATRANGE("ofps", encode_output.fps, CONF_GLOBAL, 0.0, 1000000.0), |