diff options
author | wm4 <wm4@nowhere> | 2014-01-01 19:25:52 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-01-01 19:25:52 +0100 |
commit | 9169737a477f96425ae60a900fd5b1b4c85a3d10 (patch) | |
tree | 57032d5cbb46612d067cd7e169d6e2bf67361a40 /player | |
parent | bbdd030a582718be0f3375bf9dff9bdd449a65cb (diff) | |
download | mpv-9169737a477f96425ae60a900fd5b1b4c85a3d10.tar.bz2 mpv-9169737a477f96425ae60a900fd5b1b4c85a3d10.tar.xz |
player: load encoding-profiles.conf before the main config
Otherwise one can't add profiles based on the encoding profiles.
Diffstat (limited to 'player')
-rw-r--r-- | player/configfiles.c | 14 |
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; |