From 83f21cec7b7271486a13638ab308658550403c40 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 2 Aug 2012 19:31:33 +0200 Subject: [PATCH] man: remove documentation for deleted stuff Also make some minor cosmetic changes. --- DOCS/man/en/ao.rst | 39 -------- DOCS/man/en/mplayer.rst | 36 ++----- DOCS/man/en/options.rst | 194 +++++------------------------------ DOCS/man/en/vo.rst | 217 ---------------------------------------- 4 files changed, 38 insertions(+), 448 deletions(-) diff --git a/DOCS/man/en/ao.rst b/DOCS/man/en/ao.rst index 4f817774ed..3ed1fbbb58 100644 --- a/DOCS/man/en/ao.rst +++ b/DOCS/man/en/ao.rst @@ -32,9 +32,6 @@ alsa the ALSA device name. For hwac3 output via S/PDIF, use an "iec958" or "spdif" device, unless you really know how to set it correctly. -alsa5 - ALSA 0.5 audio output driver - oss OSS audio output driver @@ -45,14 +42,6 @@ oss Sets the audio mixer channel (default: pcm). -sdl (SDL only) - highly platform independent SDL (Simple Directmedia Layer) library audio - output driver - - - Explicitly choose the SDL audio driver to use (default: let SDL - choose). - jack audio output through JACK (Jack Audio Connection Kit) @@ -68,9 +57,6 @@ jack Automatically start jackd if necessary (default: disabled). Note that this seems unreliable and will spam stdout with server messages. -nas - audio output through NAS - coreaudio (Mac OS X only) native Mac OS X audio output driver @@ -90,15 +76,6 @@ pulse string uses a local connection, "localhost" uses network transfer (most likely not what you want). -sun (Sun only) - native Sun audio output driver - - - Explicitly choose the audio device to use (default: ``/dev/audio``). - -win32 (Windows only) - native Windows waveout audio output driver - dsound (Windows only) DirectX DirectSound audio output driver @@ -106,22 +83,9 @@ dsound (Windows only) Sets the device number to use. Playing a file with ``-v`` will show a list of available devices. -ivtv (IVTV only) - IVTV specific MPEG audio output driver. Works with ``--ac=hwmpa`` only. - v4l2 (requires Linux 2.6.22+ kernel) Audio output driver for V4L2 cards with hardware MPEG decoder. -mpegpes (DVB only) - Audio output driver for DVB cards that writes the output to an MPEG-PES - file if no DVB card is installed. - - card=<1-4> - DVB card to use if more than one card is present. If not specified - MPlayer will search the first usable card. - file= - output filename - null Produces no audio output but maintains video playback speed. Use ``--nosound`` for benchmarking. @@ -147,6 +111,3 @@ rsound port= Set the TCP port used for connecting to the server (default: 12345). Not used if connecting to a Unix domain socket. - -plugin - plugin audio output driver diff --git a/DOCS/man/en/mplayer.rst b/DOCS/man/en/mplayer.rst index 621df0431c..43fb2a47e5 100644 --- a/DOCS/man/en/mplayer.rst +++ b/DOCS/man/en/mplayer.rst @@ -4,9 +4,10 @@ mplayer2 manual page Synopsis ======== -| **mplayer** [options] [file|URL|playlist|-] -| **mplayer** [options] file1 [specific options] [file2] [specific options] -| **mplayer** [options] {group of files and options} [group-specific options] +| **mplayer** [options] [file|URL|-] +| **mplayer** [options] --playlist=PLAYLIST +| **mplayer** [options] files +| **mplayer** [options] {group of files and options} | **mplayer** [br]://[title][/device] [options] | **mplayer** [dvd|dvdnav]://[title|[start\_title]-end\_title][/device] [options] | **mplayer** \vcd://track[/device] @@ -26,8 +27,7 @@ Synopsis DESCRIPTION =========== -**mplayer** is a movie player for Linux (runs on many other platforms and CPU -architectures, see the documentation). It supports a wide variety of video +**mplayer** is a movie player for Linux. It supports a wide variety of video file formats, audio and video codecs, and subtitle types. Special input URL types are available to read input from a variety of sources other than disk files. Depending on platform, a variety of different video and audio output @@ -75,12 +75,6 @@ BACKSPACE ENTER Go forward in the playlist, even over the end. -HOME and END - next/previous playtree entry in the parent list - -INS and DEL (ASX playlist only) - next/previous alternative source. - p / SPACE Pause (pressing again unpauses). @@ -109,10 +103,10 @@ U m Mute sound. -\_ (MPEG-TS, AVI and libavformat only) +\_ Cycle through the available video tracks. -\# (DVD, Blu-ray, MPEG, Matroska, AVI and libavformat only) +\# Cycle through the available audio tracks. TAB (MPEG-TS and libavformat only) @@ -141,7 +135,7 @@ j and J Cycle through the available subtitles. y and g - Step forward/backward in the subtitle list. + Adjust subtitle delay to immediately display previous/next subtitle. F Toggle displaying "forced subtitles". @@ -165,10 +159,10 @@ r and t i (``--edlout`` mode only) Set start or end of an EDL skip and write it out to the given file. -s (``--vf`` screenshot only) +s Take a screenshot. -S (``--vf`` screenshot only) +S Start/stop taking screenshots. I @@ -186,7 +180,7 @@ D (``--vo=vdpau``, ``--vf=yadif``, ``--vf=kerndeint`` only) A Cycle through the available DVD angles. -c (currently ``--vo=vdpau`` and ``--vo=xv`` only) +c Change YUV colorspace. (The following keys are valid only when using a video output that supports the @@ -223,14 +217,6 @@ command + f command + [ and command + ] Set movie window alpha. -(The following keys are valid only when using the sdl video output driver.) - -c - Cycle through available fullscreen modes. - -n - Restore original mode. - (The following keys are valid if you have a keyboard with multimedia keys.) PAUSE diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 0fea91078c..9e71658963 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -120,7 +120,7 @@ --aspect= Override movie aspect ratio, in case aspect information is incorrect or - missing in the file being played. See also ``--noaspect``. + missing in the file being played. See also ``--no-aspect``. *EXAMPLE*: @@ -217,22 +217,6 @@ Enables caching for the stream used by ``--audiofile``, using the specified amount of memory. ---ausid= - Select audio substream channel. Currently the valid range is 0x55..0x75 - and applies only to MPEG-TS when handled by the native demuxer (not by - libavformat). The format type may not be correctly identified because of - how this information (or lack thereof) is embedded in the stream, but it - will demux correctly the audio streams when multiple substreams are - present. MPlayer prints the available substream IDs when run with - ``--identify``. See also ``--alang``. - ---autoq= - Used with ``--vf=[s]pp``. - Dynamically changes the level of postprocessing depending on the available - spare CPU time. The number you specify will be the maximum level used. - Usually you can use some big number. You have to use ``--vf=[s]pp`` - without parameters in order for this to work. - --autosub, --no-autosub Load additional subtitle files matching the video filename. Enabled by default. See also ``--sub-fuzziness``. @@ -242,9 +226,9 @@ Specifying ``--autosync=0``, the default, will cause frame timing to be based entirely on audio delay measurements. Specifying ``--autosync=1`` will do the same, but will subtly change the A/V correction algorithm. An - uneven video framerate in a movie which plays fine with ``--nosound`` can + uneven video framerate in a movie which plays fine with ``--no-audio`` can often be helped by setting this to an integer value greater than 1. The - higher the value, the closer the timing will be to ``--nosound``. Try + higher the value, the closer the timing will be to ``--no-audio``. Try ``--autosync=30`` to smooth out problems with sound drivers which do not implement a perfect audio delay measurement. With this value, if large A/V sync offsets occur, they will only take about 1 or 2 seconds to settle @@ -258,13 +242,9 @@ is also used to set the maximum delivery bandwidth allowing faster cache filling and stream dumping. ---benchmark - Prints some statistics on CPU usage and dropped frames at the end of - playback. Use in combination with ``--nosound`` and ``--vo=null`` for - benchmarking only the video codec. - - *NOTE*: With this option MPlayer will also ignore frame duration when - playing only video (you can think of that as infinite fps). +--untimed + Do not sleep when outputting video frames. Useful for benchmarks when used + with --no-audio. --bluray-angle= Some Blu-ray discs contain scenes that can be viewed from multiple angles. @@ -297,7 +277,7 @@ size of the cache in kilobytes. Caching is enabled by default (with a default cache size) for network streams. May be useful when playing files from slow media, but can also have negative effects, especially with file - formats that require a lot of seeking, such as mp4. See also ``--nocache``. + formats that require a lot of seeking, such as mp4. See also ``--no-cache``. --cache-min= Playback will start when the cache has been filled up to of @@ -467,7 +447,7 @@ Changes the colorkey to an RGB value of your choice. 0x000000 is black and 0xffffff is white. Only supported by the fbdev, svga, vesa, xmga, xover, xv (see ``--vo=xv:ck``) and directx video output drivers. See also - ``--nocolorkey``. + ``--no-colorkey``. --consolecontrols, --no-consolecontrols ``--no-consolecontrols`` prevents the player from reading key events from @@ -502,11 +482,6 @@ off by some frames. This option does not work correctly with some demuxers and codecs. ---crash-debug - DEBUG CODE. - Automatically attaches gdb upon crash or **SIGTRAP**. Support must be - compiled in by configuring with ``--enable-crash-debug``. - --cursor-autohide-delay= Make mouse cursor automatically hide after given number of milliseconds. A value of -1 will disable cursor autohide. A value of -2 means the cursor @@ -544,61 +519,10 @@ *WARNING*: May cause OSD/SUB corruption! ---dumpaudio - Dumps raw compressed audio stream to ``./stream.dump`` (useful with - MPEG/AC-3, in most other cases the resulting file will not be playable). - If you give more than one of ``--dumpaudio``, ``--dumpvideo``, - ``--dumpstream`` on the command line only the last one will work. - --dumpfile= Specify which file MPlayer should dump to. Should be used together with ``--dumpaudio`` / ``--dumpvideo`` / ``--dumpstream`` / ``--capture``. ---dumpjacosub - Convert the given subtitle (specified with the ``--sub`` option) to the - time-based JACOsub subtitle format. Creates a ``dumpsub.js`` file in the - current directory. - ---dumpmicrodvdsub - Convert the given subtitle (specified with the ``--sub`` option) to the - MicroDVD subtitle format. Creates a dumpsub.sub file in the current - directory. - ---dumpmpsub - Convert the given subtitle (specified with the ``--sub`` option) to - MPlayer's subtitle format, MPsub. Creates a dump.mpsub file in the current - directory. - ---dumpsami - Convert the given subtitle (specified with the ``--sub`` option) to the - time-based SAMI subtitle format. Creates a ``dumpsub.smi`` file in the - current directory. - ---dumpsrtsub - Convert the given subtitle (specified with the ``--sub`` option) to the - time-based SubViewer (SRT) subtitle format. Creates a ``dumpsub.srt`` file - in the current directory. - - *NOTE*: Some broken hardware players choke on SRT subtitle files with Unix - line endings. If you are unlucky enough to have such a box, pass your - subtitle files through ``unix2dos`` or a similar program to replace Unix - line endings with DOS/Windows line endings. - ---dumpstream - Dumps the raw stream to ``./stream.dump``. Useful when ripping from DVD or - network. If you give more than one of ``--dumpaudio``, ``--dumpvideo``, - ``--dumpstream`` on the command line only the last one will work. - ---dumpsub - BETA CODE. - Dumps the subtitle substream from VOB streams. Also see the **--dump*sub** - options. - ---dumpvideo - Dump raw compressed video stream to ``./stream.dump`` (not very usable). - If you give more than one of ``--dumpaudio``, ``--dumpvideo``, - ``--dumpstream`` on the command line only the last one will work. - --dvbin= Pass the following parameters to the DVB input module, in order to override the default ones: @@ -734,9 +658,6 @@ - ``--font='Bitstream Vera Sans'`` (usual case with fontconfig) - ``--font='Bitstream Vera Sans:style=Bold'`` (usual case with fontconfig) ---fontconfig, --no-fontconfig - Enables the use of fontconfig managed fonts. Enabled by default. - --force-window-position Forcefully move MPlayer's video output window to default location whenever there is a change in video parameters, video stream or file. This used to @@ -881,7 +802,7 @@ *NOTE*: mplayer uses this command without any checking, it is your responsibility to ensure it does not cause security problems (e.g. make sure to use full paths if "." is in your path like on Windows). It also - only works when playing video (i.e. not with ``--novideo`` but works with + only works when playing video (i.e. not with ``--no-video`` but works with ``-vo=null``). This can be "misused" to disable screensavers that do not support the @@ -1326,16 +1247,6 @@ Enabled by default. Disable mouse button press/release input (mozplayerxp's context menu relies on this option). ---msgcharset= - Convert console messages to the specified character set (default: - autodetect). Text will be in the encoding specified with the --charset - configure option. Set this to "noconv" to disable conversion (for e.g. - iconv problems). - - *NOTE*: The option takes effect after command line parsing has finished. - The ``MPLAYER_CHARSET`` environment variable can help you get rid of the - first lines of garbled output. - --msgcolor Enable colorful console output on terminals that support ANSI color. @@ -1375,23 +1286,23 @@ Force usage of non-interleaved AVI parser (fixes playback of some bad AVI files). ---noaspect +--no-aspect Ignore aspect ratio information from video file and assume the video has square pixels. See also ``--aspect``. ---nobps +--no-bps (Internal AVI demuxer which is not used by default only) Do not use average byte/second value for A-V sync. Helps with some AVI files with broken header. ---nocache +--no-cache Turn off input stream caching. See ``--cache``. ---nocolorkey +--no-colorkey Disables colorkeying. Only supported by the fbdev, svga, vesa, xmga, xover, xv (see ``--vo=xv:ck``) and directx video output drivers. ---noconfig= +--no-config= Do not parse selected configuration files. *NOTE*: If ``--include`` or ``--use-filedir-conf`` options are specified @@ -1403,18 +1314,18 @@ :system: system configuration file :user: user configuration file ---noidx +--no-idx Do not use index present in the file even if one is present. ---nosound +--no-audio Do not play sound. Useful for benchmarking. ---nosub +--no-sub Disables any otherwise auto-selected internal subtitles (as e.g. the Matroska/mkv demuxer supports). Use ``--no-autosub`` to disable the loading of external subtitle files. ---novideo +--no-video Do not play video. With some demuxers this may not work. In those cases you can try ``--vc=null --vo=null`` instead; but ``--vc=null`` is always unreliable. @@ -1433,15 +1344,8 @@ --osd-duration=