From 0dcb51c7fa2c676ec30f2bac216f904dfc4ffa6f Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 26 Jun 2017 11:44:10 +0200 Subject: player: always load encoding-profiles.conf This makes things like --show-profile=enc-v-h264 just work again. Currently I don't see a reason why we should not always load the encoding profiles. Although I guess this used to be different in the past. (It probably won't take long until I revert this again - seems like a fight you can't win for some reason.) Fixes #4551. --- player/configfiles.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/player/configfiles.c b/player/configfiles.c index 9a8e5b6853..03892ae577 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -70,10 +70,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