From 935ca52d81a1e57deea7125e4aee482c9dad6159 Mon Sep 17 00:00:00 2001 From: ChrisK2 Date: Tue, 15 Oct 2013 22:42:00 +0200 Subject: docs: Add osc.rst to mpv.rst Also moved OPTIONS headline into options.rst --- DOCS/man/en/mpv.rst | 5 ++--- DOCS/man/en/options.rst | 3 +++ 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 -- cgit v1.2.3