From 9a996313e659d0f3d3058bd7c893a09f82096f0e Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 12 Jul 2017 13:00:40 +0200 Subject: Revert "player: always load encoding-profiles.conf" This reverts commit 0dcb51c7fa2c676ec30f2bac216f904dfc4ffa6f. I randomly decided that this was better. It can be re-applied once it actually becomes necessary in some way. Note that this worked fine. My main gripe with this is that it can spam the log file with encoding stuff even if playback mode is used. --- player/configfiles.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/player/configfiles.c b/player/configfiles.c index 54b7587936..acc8f0d60b 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, SECT_ENCODE, "encoding-profiles.conf"); + } load_all_cfgfiles(mpctx, section, "mpv.conf|config"); -- cgit v1.2.3