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 /player/main.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 'player/main.c')
| -rw-r--r-- | player/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/player/main.c b/player/main.c index 506f6fccd9..0763fd69b8 100644 --- a/player/main.c +++ b/player/main.c @@ -300,7 +300,7 @@ static void osdep_preinit(int *p_argc, char ***p_argv) static int cfg_include(void *ctx, char *filename, int flags) { struct MPContext *mpctx = ctx; - return m_config_parse_config_file(mpctx->mconfig, filename, flags); + return m_config_parse_config_file(mpctx->mconfig, filename, NULL, flags); } struct MPContext *mp_create(void) |