summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-01 19:25:52 +0100
committerwm4 <wm4@nowhere>2014-01-01 20:57:16 +0100
commit6ab0dbf2ed066f1c7e3e2bd613fa5a1a4b0b867a (patch)
tree5d397da79faa41b5b55a448c99720f292fa4e2f0
parentc002196ffe2149af6d5c5c0f2a6bee8dc6eb16aa (diff)
downloadmpv-6ab0dbf2ed066f1c7e3e2bd613fa5a1a4b0b867a.tar.bz2
mpv-6ab0dbf2ed066f1c7e3e2bd613fa5a1a4b0b867a.tar.xz
player: load encoding-profiles.conf before the main config
Otherwise one can't add profiles based on the encoding profiles.
-rw-r--r--player/configfiles.c14
1 files 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;