From b85983a4a6f52c85651f916bfedb8234c9424634 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 19 Apr 2014 22:05:17 +0200 Subject: 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. --- player/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'player/main.c') 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) -- cgit v1.2.3