diff options
Diffstat (limited to 'DOCS/man')
-rw-r--r-- | DOCS/man/en/changes.rst | 1 | ||||
-rw-r--r-- | DOCS/man/en/input.rst | 4 | ||||
-rw-r--r-- | DOCS/man/en/options.rst | 67 |
3 files changed, 34 insertions, 38 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index 892b3f0af9..adaf1aa0d2 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -120,6 +120,7 @@ Command line switches -vobsub --sub (pass the .idx file) -ass-bottom-margin --vf=sub=bottom:top -vc ffh264vdpau (etc.) --hwdec=vdpau + -ac spdifac3 --ad=spdif:ac3 (see --ad=help) -x W, -y H --geometry=WxH + --no-keepaspect -xy W --autofit=W =================================== =================================== diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst index f146208fd3..6b61578a1a 100644 --- a/DOCS/man/en/input.rst +++ b/DOCS/man/en/input.rst @@ -283,7 +283,7 @@ hr-seek x see ``--hr-seek`` volume x current volume (0-100) mute x current mute status (bool) audio-delay x see ``--audio-delay`` -audio-format audio format (codec tag) +audio-format audio format (string) audio-codec audio codec selected for decoding audio-bitrate audio bitrate samplerate audio samplerate @@ -306,7 +306,7 @@ saturation x see ``--saturation`` hue x see ``--hue`` panscan x see ``--panscan`` vsync x see ``--vsync`` -video-format video format (integer FourCC) +video-format video format (string) video-codec video codec selected for decoding video-bitrate video bitrate width video width diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index ea43b9c49f..12dccdc8c4 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -10,14 +10,32 @@ (``--ao=oss`` only) (OBSOLETE) Override audio driver/card buffer size detection. ---ac=<[-\|+]codec1,[-\|+]codec2,...[,]> - Specify a priority list of audio codecs to be used, according to their - codec name in codecs.conf. Use a '-' before the codec name to omit it. - Use a '+' before the codec name to force it, this will likely crash! If - the list has a trailing ',' mpv will fall back on codecs not contained - in the list. +--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 + explicitly selected or rejected by the option. - *NOTE*: See ``--ac=help`` for a full list of available codecs. + ``-`` at the end of the list suppresses fallback to other available + decoders not on the ``--ad`` list. ``+`` in front of an entry forces the + decoder. Both of these shouldn't normally be used, because they break + normal decoder auto-selection! + + ``-`` in front of an entry disables selection of the decoder. + + *EXAMPLE*: + + ``--ad=lavc: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=help`` + List all available decoders. --af=<filter1[=parameter1:parameter2:...],filter2,...> Specify a list of audio filters to apply to the audio stream. See @@ -60,17 +78,6 @@ list=<filters> Same as ``--af``. ---afm=<driver1,driver2,...> - Specify a priority list of audio codec families to be used, according to - their codec name in codecs.conf. Falls back on the default codecs if none - of the given codec families work. - - *NOTE*: See ``--afm=help`` for a full list of available codec families. - - *EXAMPLE*: - - :``--afm=ffmpeg``: Try FFmpeg's libavcodec codecs first. - --aid=<ID|auto|no> Select audio channel. ``auto`` selects the default, ``no`` disables audio. See also ``--alang``. @@ -409,10 +416,6 @@ the start of the next one then keep playing video normally over the chapter change instead of doing a seek. ---codecs-file=<filename> - Override the standard search path and use the specified file instead of - the builtin codecs.conf. - --colormatrix=<colorspace> Controls the YUV to RGB color space conversion when playing video. There are various standards. Normally, BT.601 should be used for SD video, and @@ -2257,14 +2260,13 @@ Increment verbosity level, one level for each ``-v`` found on the command line. ---vc=<[-\|+]codec1,[-\|+]codec2,...[,]> - Specify a priority list of video codecs to be used, according to their - codec name in ``codecs.conf``. Use a '-' before the codec name to omit it. - Use a '+' before the codec name to force it, this will likely crash! If - the list has a trailing ',' mpv will fall back on codecs not contained - in the list. +--vd=<[+|-]family1:(*|decoder1),[+|-]family2:(*|decoder2),...[-]> + 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 + operate on different codec lists. - *NOTE*: See ``--vc=help`` for a full list of available codecs. + *NOTE*: See ``--vd=help`` for a full list of available decoders. --vf=<filter1[=parameter1:parameter2:...],filter2,...> Specify a list of video filters to apply to the video stream. See @@ -2273,13 +2275,6 @@ ``--vf-clr`` exist to modify a previously specified list, but you shouldn't need these for typical use. ---vfm=<driver1,driver2,...> - Specify a priority list of video codec families to be used, according to - their names in codecs.conf. Falls back on the default codecs if none of - the given codec families work. - - *NOTE*: See ``--vfm=help`` for a full list of available codec families. - --vid=<ID|auto|no> Select video channel. ``auto`` selects the default, ``no`` disables video. |