summaryrefslogtreecommitdiffstats
path: root/DOCS/man
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-12-23 18:12:29 +0100
committerwm4 <wm4@nowhere>2016-12-23 18:12:29 +0100
commit9d21f2503f28a7be0e493ab18a4acbaae02c3d0a (patch)
tree8a636fae2155338bf4ee2534a846ce92dd1808ef /DOCS/man
parentc560f6ff0ab9aec70e53a268e2ff388a85ec3ca0 (diff)
downloadmpv-9d21f2503f28a7be0e493ab18a4acbaae02c3d0a.tar.bz2
mpv-9d21f2503f28a7be0e493ab18a4acbaae02c3d0a.tar.xz
options: deprecate codec family selection in --vd/--ad
Useless now, so get rid of it. Also affects some user-visible display things (like reported codec in use).
Diffstat (limited to 'DOCS/man')
-rw-r--r--DOCS/man/options.rst19
1 files changed, 11 insertions, 8 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index bc33edc13d..f1101f27f8 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -555,7 +555,7 @@ Video
Specify the video output backend to be used. See `VIDEO OUTPUT DRIVERS`_ for
details and descriptions of available drivers.
-``--vd=<[+|-]family1:(*|decoder1),[+|-]family2:(*|decoder2),...[-]>``
+``--vd=<...>``
Specify a priority list of video decoders to be used, according to their
family and name. See ``--ad`` for further details. Both of these options
use the same syntax and semantics; the only difference is that they
@@ -1134,12 +1134,14 @@ Audio
``--ad=<[+|-]family1:(*|decoder1),[+|-]family2:(*|decoder2),...[-]>``
Specify a priority list of audio decoders to be used, according to their
- family and decoder name. Entries like ``family:*`` prioritize all decoders
- of the given family. When determining which decoder to use, the first
- decoder that matches the audio format is selected. If that is unavailable,
- the next decoder is used. Finally, it tries all other decoders that are not
+ decoder name. When determining which decoder to use, the first decoder that
+ matches the audio format is selected. If that is unavailable, the next
+ decoder is used. Finally, it tries all other decoders that are not
explicitly selected or rejected by the option.
+ Specifying family names is deprecated. Entries like ``family:*`` prioritize
+ all decoders of the given family.
+
``-`` at the end of the list suppresses fallback on other available
decoders not on the ``--ad`` list. ``+`` in front of an entry forces the
decoder. Both of these should not normally be used, because they break
@@ -1149,12 +1151,13 @@ Audio
.. admonition:: Examples
- ``--ad=lavc:mp3float``
+ ``--ad=mp3float``
Prefer the FFmpeg/Libav ``mp3float`` decoder over all other MP3
decoders.
- ``--ad=spdif:ac3,lavc:*``
- Always prefer spdif AC3 over FFmpeg/Libav over anything else.
+ ``--ad=lavc:mp3float``
+ Prefer the FFmpeg/Libav ``mp3float`` decoder over all other MP3
+ decoders. (Using deprecated family syntax.)
``--ad=help``
List all available decoders.