From 5fe2c19029958e3776d14abf540618e122130e90 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 9 May 2015 16:47:25 +0200 Subject: 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. --- player/configfiles.c | 6 +----- 1 file changed, 1 insertion(+), 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"); -- cgit v1.2.3