summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChrisK2 <spam@kalania.de>2013-10-15 22:42:00 +0200
committerChrisK2 <spam@kalania.de>2013-10-15 22:42:00 +0200
commit935ca52d81a1e57deea7125e4aee482c9dad6159 (patch)
tree041f99a1217d33f45b25d97b58c2e528d3219d4e
parent71b0c2b88c5d66acfafdf83acd974edb206b989e (diff)
downloadmpv-935ca52d81a1e57deea7125e4aee482c9dad6159.tar.bz2
mpv-935ca52d81a1e57deea7125e4aee482c9dad6159.tar.xz
docs: Add osc.rst to mpv.rst
Also moved OPTIONS headline into options.rst
-rw-r--r--DOCS/man/en/mpv.rst5
-rw-r--r--DOCS/man/en/options.rst3
2 files changed, 5 insertions, 3 deletions
diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst
index 300a023326..0ee64d41b6 100644
--- a/DOCS/man/en/mpv.rst
+++ b/DOCS/man/en/mpv.rst
@@ -424,9 +424,6 @@ taking screenshots is handled by the VOs, and adding the screenshot filter will
break hardware decoding. (The filter may still be useful for taking screenshots
at a certain point within the video chain when using multiple video filters.)
-OPTIONS
-=======
-
.. include:: options.rst
.. include:: ao.rst
@@ -441,6 +438,8 @@ OPTIONS
.. include:: input.rst
+.. include:: osc.rst
+
.. include:: lua.rst
.. include:: changes.rst
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 521052b1c9..3a5bd0b6b7 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1,3 +1,6 @@
+OPTIONS
+=======
+
``--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