summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorAlessandro Ghedini <alessandro@ghedini.me>2014-05-23 21:03:11 +0200
committerAlessandro Ghedini <alessandro@ghedini.me>2014-05-23 21:14:22 +0200
commitcec9613505c78e7e5c9d2fe5bcfd59d59e9e91dd (patch)
tree06ef40b0b831afc5c73f0a5e053982841bb4e832 /DOCS
parent76bd701a7a5ce098cf348843f680b4a989ff6f23 (diff)
downloadmpv-cec9613505c78e7e5c9d2fe5bcfd59d59e9e91dd.tar.bz2
mpv-cec9613505c78e7e5c9d2fe5bcfd59d59e9e91dd.tar.xz
manpage: update references to renamed options
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/af.rst8
-rw-r--r--DOCS/man/en/changes.rst4
-rw-r--r--DOCS/man/en/input.rst2
-rw-r--r--DOCS/man/en/options.rst4
4 files changed, 9 insertions, 9 deletions
diff --git a/DOCS/man/en/af.rst b/DOCS/man/en/af.rst
index 6aa5ca393a..0512376ff2 100644
--- a/DOCS/man/en/af.rst
+++ b/DOCS/man/en/af.rst
@@ -241,7 +241,7 @@ Available filters are:
48000 for example.
``<channels>``
- Force mixing to a specific channel layout. See ``--channels`` option
+ Force mixing to a specific channel layout. See ``--audio-channels`` option
for possible values.
``<out-format>``
@@ -351,7 +351,7 @@ Available filters are:
If you just want to force remixing to a certain output channel layout,
it is easier to use the ``format`` filter. For example,
- ``mpv '--af=format=channels=5.1' '--channels=5.1'`` would always force
+ ``mpv '--af=format=channels=5.1' '--audio-channels=5.1'`` would always force
remixing audio to 5.1 and output it like this.
``sub[=fc:ch]``
@@ -380,7 +380,7 @@ Available filters are:
.. admonition:: Example
- ``mpv --af=sub=100:4 --channels=5 media.avi``
+ ``mpv --af=sub=100:4 --audio-channels=5 media.avi``
Would add a subwoofer channel with a cutoff frequency of 100Hz to
output channel 4.
@@ -408,7 +408,7 @@ Available filters are:
.. admonition:: Example
- ``mpv --af=surround=15 --channels=4 media.avi``
+ ``mpv --af=surround=15 --audio-channels=4 media.avi``
Would add surround sound decoding with 15ms delay for the sound to
the rear speakers.
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index 9b810424e6..a60cced3e6 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -194,7 +194,7 @@ Command Line Switches
``-sub`` ``--sub-file``
``-subcp`` ``--sub-codepage``
``-subdelay`` ``--sub-delay``
- ``-subfile`` ``--sub``
+ ``-subfile`` ``--sub-file``
``-subfont-*`` ``--sub-text-*``, ``--osd-*``
``-subfont-text-scale`` ``--sub-scale``
``-subfont`` ``--sub-text-font``
@@ -203,7 +203,7 @@ Command Line Switches
``-tvscan`` ``--tv-scan``
``-use-filename-title`` ``--title='${filename}'``
``-vc ffh264vdpau`` (etc.) ``--hwdec=vdpau``
- ``-vobsub`` ``--sub`` (pass the .idx file)
+ ``-vobsub`` ``--sub-file`` (pass the .idx file)
``-x W``, ``-y H`` ``--geometry=WxH`` + ``--no-keepaspect``
``-xineramascreen`` ``--screen`` (different values)
``-xy W`` ``--autofit=W``
diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst
index 28518cc475..e32f1ea657 100644
--- a/DOCS/man/en/input.rst
+++ b/DOCS/man/en/input.rst
@@ -1248,7 +1248,7 @@ Property Expansion
------------------
All string arguments to input commands as well as certain options (like
-``--playing-msg``) are subject to property expansion.
+``--term-playing-msg``) are subject to property expansion.
.. admonition:: Example for input.conf
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 338413c211..2aa148a70a 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -39,7 +39,7 @@ OPTIONS
``--ad-lavc-downmix=<yes|no>``
Whether to request audio channel downmixing from the decoder (default: yes).
Some decoders, like AC-3, AAC and DTS, can remix audio on decoding. The
- requested number of output channels is set with the ``--channels`` option.
+ requested number of output channels is set with the ``--audio-channels`` option.
Useful for playing surround audio on a stereo system.
``--ad-lavc-threads=<0-16>``
@@ -2334,7 +2334,7 @@ OPTIONS
``--term-playing-msg=<string>``
Print out a string after starting playback. The string is expanded for
- properties, e.g. ``--playing-msg='file: ${filename}'`` will print the string
+ properties, e.g. ``--term-playing-msg='file: ${filename}'`` will print the string
``file:`` followed by a space and the currently played filename.
See `Property Expansion`_.