RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
wm4 2017-06-26 11:44:10 +02:00
parent 8ce65f7c11
commit 0dcb51c7fa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
player/configfiles.c
View File

@ -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");