diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-11-20 18:15:08 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-11-20 18:15:08 +0100 |
| commit | 8700700de8a4103724796077034f7f254ad974bc (patch) | |
| tree | 2fce4dee518a202c45c3f16567db36edc92ed914 /DOCS/man/input.rst | |
| parent | e6b85c91700bee0ddc92e98a30d5021691bd6f65 (diff) | |
| parent | eafc273d2c2ae6d247d741202e58ca23dc938cb2 (diff) | |
| download | mpv-8700700de8a4103724796077034f7f254ad974bc.tar.bz2 mpv-8700700de8a4103724796077034f7f254ad974bc.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'DOCS/man/input.rst')
| -rw-r--r-- | DOCS/man/input.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst index d15aa41903..508e7dd252 100644 --- a/DOCS/man/input.rst +++ b/DOCS/man/input.rst @@ -1912,8 +1912,9 @@ Property list The ``name`` is what is to be passed to the ``--audio-device`` option (and often a rather cryptic audio API-specific ID), while ``description`` is - human readable free form text. The description is an empty string if none - was received. + human readable free form text. The description is set to the device name + (minus mpv-specific ``<driver>/`` prefix) if no description is available + or the description would have been an empty string. The special entry with the name set to ``auto`` selects the default audio output driver and the default device. |