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).

2 files changed, 12 insertions, 8 deletions

diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index d2c8536fd4..9f61a13e59 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -45,6 +45,7 @@ Interface changes
     - remove --fs-black-out-screens option for macOS
     - change how spdif codecs are selected. You can't enable spdif passthrough
       with --ad anymore. This was deprecated; use --audio-spdif instead.
+    - deprecate the "family" selection with --ad/--vd
  --- mpv 0.22.0 ---
     - the "audio-device-list" property now sets empty device description to the
       device name as a fallback
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.