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

Revert "player: always load encoding-profiles.conf" 

This reverts commit 0dcb51c7fa.

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.
This commit is contained in:
wm4 2017-07-12 13:00:40 +02:00
parent 005ec766c6
commit 9a996313e6
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

@ -71,10 +71,10 @@ void mp_parse_cfgfiles(struct MPContext *mpctx)
// So we "divert" normal options into a separate section, and the diverted // So we "divert" normal options into a separate section, and the diverted
// section is never used - unless maybe it's explicitly referenced from an // section is never used - unless maybe it's explicitly referenced from an
// encoding profile. // encoding profile.
if (encoding) if (encoding) {
section = "playback-default"; 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"); load_all_cfgfiles(mpctx, section, "mpv.conf|config");