Merge branch 'mpv-player:master' into plex-htpc-hdr-patches

mitzsch · Apr 21, 2024 · 3e89839 · 3e89839
2 parents 10b460a + 5318522
commit 3e89839
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 20 deletions.
diff --git a/DOCS/man/console.rst b/DOCS/man/console.rst
@@ -123,7 +123,7 @@ Configuration
 
 This script can be customized through a config file ``script-opts/console.conf``
 placed in mpv's user directory and through the ``--script-opts`` command-line
-option. The configuration syntax is described in `ON SCREEN CONTROLLER`_.
+option. The configuration syntax is described in `mp.options functions`_.
 
 Key bindings can be changed in a standard way, see for example stats.lua
 documentation.

diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst
@@ -130,22 +130,9 @@ del             Cycles visibility between never / auto (mouse-move) / always
 Configuration
 -------------
 
-The OSC offers limited configuration through a config file
-``script-opts/osc.conf`` placed in mpv's user dir and through the
-``--script-opts`` command-line option. Options provided through the command-line
-will override those from the config file.
-
-Config Syntax
-~~~~~~~~~~~~~
-
-The config file must exactly follow the following syntax::
-
-    # this is a comment
-    optionA=value1
-    optionB=value2
-
-``#`` can only be used at the beginning of a line and there may be no
-spaces around the ``=`` or anywhere else.
+This script can be customized through a config file ``script-opts/osc.conf``
+placed in mpv's user directory and through the ``--script-opts`` command-line
+option. The configuration syntax is described in `mp.options functions`_.
 
 Command-line Syntax
 ~~~~~~~~~~~~~~~~~~~

diff --git a/DOCS/man/stats.rst b/DOCS/man/stats.rst
@@ -43,7 +43,7 @@ Configuration
 
 This script can be customized through a config file ``script-opts/stats.conf``
 placed in mpv's user directory and through the ``--script-opts`` command-line
-option. The configuration syntax is described in `ON SCREEN CONTROLLER`_.
+option. The configuration syntax is described in `mp.options functions`_.
 
 Configurable Options
 ~~~~~~~~~~~~~~~~~~~~

diff --git a/player/loadfile.c b/player/loadfile.c
@@ -511,10 +511,10 @@ static bool compare_track(struct track *t1, struct track *t2, char **langs, bool
         return l1 > l2;
     if (forced)
         return t1->forced_track;
-    if (sub && !t2->forced_select && t2->forced_track)
-        return !t1->forced_track;
     if (t1->default_track != t2->default_track && !t2->forced_select)
         return t1->default_track;
+    if (sub && !t2->forced_select && t2->forced_track)
+        return !t1->forced_track;
     if (os_langs && l1 != l2)
         return l1 > l2;
     if (t1->attached_picture != t2->attached_picture)