summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-09 16:47:25 +0200
committerwm4 <wm4@nowhere>2015-05-09 16:48:08 +0200
commit5fe2c19029958e3776d14abf540618e122130e90 (patch)
tree1a39dfb2445f138ada89db7b336039ef73781786
parente9963139da692b29e4e621e52af9107831bb8f44 (diff)
downloadmpv-5fe2c19029958e3776d14abf540618e122130e90.tar.bz2
mpv-5fe2c19029958e3776d14abf540618e122130e90.tar.xz
player: reuse a function
This has the side-effect that now all encoding-profiles.conf files are loaded. It's not clear if not doing this was intended or not.
-rw-r--r--player/configfiles.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/player/configfiles.c b/player/configfiles.c
index 0cd1d0d523..d76c87103f 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -74,11 +74,7 @@ void mp_parse_cfgfiles(struct MPContext *mpctx)
// encoding profile.
if (encoding) {
section = "playback-default";
-
- char *cf = mp_find_config_file(NULL, mpctx->global, "encoding-profiles.conf");
- if (cf)
- m_config_parse_config_file(mpctx->mconfig, cf, SECT_ENCODE, 0);
- talloc_free(cf);
+ load_all_cfgfiles(mpctx, SECT_ENCODE, "encoding-profiles.conf");
}
load_all_cfgfiles(mpctx, section, "mpv.conf|config");