summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-15 13:50:50 +0200
committerwm4 <wm4@nowhere>2016-09-15 14:50:38 +0200
commit5968a307d5c05d1b4604be4fddd416b0aecb534e (patch)
tree840ef2820d59aa7472a852662d236030498cf993
parentd1f5b926ac1c35e04ab17103da4b7855b61f9bd7 (diff)
downloadmpv-5968a307d5c05d1b4604be4fddd416b0aecb534e.tar.bz2
mpv-5968a307d5c05d1b4604be4fddd416b0aecb534e.tar.xz
options: add --hwdec=yes as alias for --hwdec=auto
This also lets you just do "mpv --hwdec file.mkv", with the minor caveat that the legacy syntax "--hwdec val" or "-hwdec val" (without "=") does not work as expected anymore.
-rw-r--r--DOCS/man/options.rst5
-rw-r--r--options/options.c1
2 files changed, 4 insertions, 2 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 0a6e979eb0..6d390ebb7d 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -591,8 +591,9 @@ Video
``<api>`` can be one of the following:
:no: always use software decoding (default)
- :auto: see below
- :auto-copy: see below
+ :auto: enable best hw decoder (see below)
+ :yes: exactly the same as ``auto``
+ :auto-copy: enable best hw decoder with copy-back (see below)
:vdpau: requires ``--vo=vdpau`` or ``--vo=opengl`` (Linux only)
:vaapi: requires ``--vo=opengl`` or ``--vo=vaapi`` (Linux only)
:vaapi-copy: copies video back into system RAM (Linux with Intel GPUs only)
diff --git a/options/options.c b/options/options.c
index e4c334b45b..d3b9c44341 100644
--- a/options/options.c
+++ b/options/options.c
@@ -86,6 +86,7 @@ extern const struct m_obj_list ao_obj_list;
const struct m_opt_choice_alternatives mp_hwdec_names[] = {
{"no", HWDEC_NONE},
{"auto", HWDEC_AUTO},
+ {"yes" , HWDEC_AUTO},
{"auto-copy", HWDEC_AUTO_COPY},
{"vdpau", HWDEC_VDPAU},
{"videotoolbox",HWDEC_VIDEOTOOLBOX},