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

player: change default section when loading encoding-profiles.conf 

It used to use the "encoding" section. Change this to the default
section to remove another small special case. encoding-profiles.conf
didn't use this by default anyway. The previous revert could mitigate
potential impacts of this a little.
This commit is contained in:
wm4 2017-07-12 13:11:14 +02:00
parent 9a996313e6
commit ca512b53a0
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DOCS/encoding.rst
View File

@ -95,12 +95,16 @@ As the options for various devices can get complex, profiles can be used.
An example profile file for encoding is provided in
etc/encoding-profiles.conf in the source tree. This file is installed and loaded
by default (if libavfilter is enabled at compilation). If you want to modify
it, you can replace and it with your own copy by doing::
by default. If you want to modify it, you can replace and it with your own copy
by doing::
mkdir -p ~/.mpv
cp /etc/mpv/encoding-profiles.conf ~/.mpv/encoding-profiles.conf
Keep in mind that the default profile is the playback one. If you want to add
options that apply only in encoding mode, put them into a ``[encoding]``
section.
Refer to the top of that file for more comments - in a nutshell, the following
options are added by it::

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
// 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, NULL, "encoding-profiles.conf");
load_all_cfgfiles(mpctx, section, "mpv.conf|config");