diff options
author | wm4 <wm4@nowhere> | 2017-06-26 11:44:10 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-06-26 11:44:10 +0200 |
commit | 0dcb51c7fa2c676ec30f2bac216f904dfc4ffa6f (patch) | |
tree | 647e69e385b151de79295dae2a7cbbb7fadcce30 /player/configfiles.c | |
parent | 8ce65f7c11e9cce93ab6019b3c4ec78784b03a5c (diff) | |
download | mpv-0dcb51c7fa2c676ec30f2bac216f904dfc4ffa6f.tar.bz2 mpv-0dcb51c7fa2c676ec30f2bac216f904dfc4ffa6f.tar.xz |
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.
Diffstat (limited to 'player/configfiles.c')
-rw-r--r-- | player/configfiles.c | 6 |
1 files 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"); |