summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@overt.org>2023-07-01 17:17:44 -0700
committerPhilip Langdale <github.philipl@overt.org>2023-07-14 20:41:24 -0700
commit9f7f9c1614d53e4e54c86c76023ffd0a7e95d72e (patch)
tree2b4ffb111264f464f074c95834a4f8371a44478c
parent4501e079968d7800424c45e567130308e959aeeb (diff)
downloadmpv-9f7f9c1614d53e4e54c86c76023ffd0a7e95d72e.tar.bz2
mpv-9f7f9c1614d53e4e54c86c76023ffd0a7e95d72e.tar.xz
input: update ctrl+h to toggle `auto-safe` rather than `auto`
It has been odd that ctrl+h toggles `auto` for hwdecs even though we always recommend people start with `auto-safe`, and `auto` will attempt various hwdecs that can fail so badly we can't fall back to software decoding. With the change to more exhaustively attempt to use hwdecs, it is now easier to get into situations where these fragile hwdecs will get attempted in basic scenarios, like pressing ctrl+h. So it is high time to default to `auto-safe`.
-rw-r--r--DOCS/man/options.rst4
-rw-r--r--etc/input.conf2
2 files changed, 3 insertions, 3 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index ecb2c77383..2766a8dbd0 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1200,7 +1200,7 @@ Video
.. note::
Use the ``Ctrl+h`` shortcut to toggle hardware decoding at runtime. It
- toggles this option between ``auto`` and ``no``.
+ toggles this option between ``auto-safe`` and ``no``.
If you decide you want to use hardware decoding by default, the general
recommendation is to try out decoding with the command line option, and
@@ -1248,9 +1248,9 @@ Video
special values:
:no: always use software decoding (default)
+ :auto-safe: enable any whitelisted hw decoder (see below)
:auto: forcibly enable any hw decoder found (see below)
:yes: exactly the same as ``auto``
- :auto-safe: enable any whitelisted hw decoder (see below)
:auto-copy: enable best hw decoder with copy-back (see below)
.. note::
diff --git a/etc/input.conf b/etc/input.conf
index 76c246a4fc..837758c987 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -160,7 +160,7 @@
#L cycle-values loop-file "inf" "no" # toggle infinite looping
#ctrl+c quit 4
#DEL script-binding osc/visibility # cycle OSC visibility between never, auto (mouse-move) and always
-#ctrl+h cycle-values hwdec "auto" "no" # toggle hardware decoding
+#ctrl+h cycle-values hwdec "auto-safe" "no" # toggle hardware decoding
#F8 show-text ${playlist} # show the playlist
#F9 show-text ${track-list} # show the list of video, audio and sub tracks