From 5e0ee41617387118deb463663176fb4d52a0a6e3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 22 Jul 2013 01:03:22 +0200 Subject: options: move --colorkey option to vo_xv --- DOCS/man/en/options.rst | 9 --------- DOCS/man/en/vo.rst | 7 +++++++ 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'DOCS/man/en') diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 394cc720f4..975139fdd9 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -524,11 +524,6 @@ It is advisable to use your graphics driver's color range option instead, if available. -``--colorkey=`` - Changes the colorkey to an RGB value of your choice. ``0x000000`` is black - and ``0xffffff`` is white. Only supported by the ``xv`` (see - ``--vo=xv:ck``) video output driver. See also ``--no-colorkey``. - ``--consolecontrols``, ``--no-consolecontrols`` ``--no-consolecontrols`` prevents the player from reading key events from standard input. Useful when reading data from standard input. This is @@ -1280,10 +1275,6 @@ ``--no-cache`` Turn off input stream caching. See ``--cache``. -``--no-colorkey`` - Disables colorkeying. Only supported by the xv (see ``--vo=xv:ck``) video - output driver. - ``--no-config`` Do not load default configuration files. This prevents loading of ``~/.mpv/config`` and ``~/.mpv/input.conf``, as well as loading the diff --git a/DOCS/man/en/vo.rst b/DOCS/man/en/vo.rst index 3f648b55fe..8f314f9b64 100644 --- a/DOCS/man/en/vo.rst +++ b/DOCS/man/en/vo.rst @@ -54,6 +54,13 @@ Available video output drivers are: auto Let Xv draw the colorkey. + ``colorkey=`` + Changes the colorkey to an RGB value of your choice. ``0x000000`` is + black and ``0xffffff`` is white. + + ``no-colorkey`` + Disables colorkeying. + ``x11`` (X11 only) Shared memory video output driver without hardware acceleration that works whenever X11 is present. -- cgit v1.2.3