From 6ab0dbf2ed066f1c7e3e2bd613fa5a1a4b0b867a Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 1 Jan 2014 19:25:52 +0100 Subject: player: load encoding-profiles.conf before the main config Otherwise one can't add profiles based on the encoding profiles. --- player/configfiles.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/player/configfiles.c b/player/configfiles.c index 88e7a71d40..e211f9b341 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -57,6 +57,13 @@ bool mp_parse_cfgfiles(struct MPContext *mpctx) bool r = true; char *conffile; + // The #if is a stupid hack to avoid errors if libavfilter is not available. +#if HAVE_VF_LAVFI && HAVE_ENCODING + conffile = mp_find_config_file(tmp, mpctx->global, "encoding-profiles.conf"); + if (conffile && mp_path_exists(conffile)) + m_config_parse_config_file(mpctx->mconfig, conffile, 0); +#endif + if (m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mpv.conf", 0) < 0) { r = false; goto done; @@ -77,13 +84,6 @@ bool mp_parse_cfgfiles(struct MPContext *mpctx) } } - // The #if is a stupid hack to avoid errors if libavfilter is not available. -#if HAVE_VF_LAVFI && HAVE_ENCODING - conffile = mp_find_config_file(tmp, mpctx->global, "encoding-profiles.conf"); - if (conffile && mp_path_exists(conffile)) - m_config_parse_config_file(mpctx->mconfig, conffile, 0); -#endif - done: talloc_free(tmp); return r; -- cgit v1.2.3