From ca512b53a0569a3b49e25c52ab191d48b73d649e Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 12 Jul 2017 13:11:14 +0200 Subject: player: change default section when loading encoding-profiles.conf It used to use the "encoding" section. Change this to the default section to remove another small special case. encoding-profiles.conf didn't use this by default anyway. The previous revert could mitigate potential impacts of this a little. --- player/configfiles.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'player') diff --git a/player/configfiles.c b/player/configfiles.c index acc8f0d60b..3f0b57cde3 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -71,10 +71,10 @@ void mp_parse_cfgfiles(struct MPContext *mpctx) // So we "divert" normal options into a separate section, and the diverted // section is never used - unless maybe it's explicitly referenced from an // encoding profile. - if (encoding) { + if (encoding) section = "playback-default"; - load_all_cfgfiles(mpctx, SECT_ENCODE, "encoding-profiles.conf"); - } + + load_all_cfgfiles(mpctx, NULL, "encoding-profiles.conf"); load_all_cfgfiles(mpctx, section, "mpv.conf|config"); -- cgit v1.2.3