man: remove documentation for deleted stuff

Also make some minor cosmetic changes.

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
     <mixer-channel>
         Sets the audio mixer channel (default: pcm).
 
-sdl (SDL only)
-    highly platform independent SDL (Simple Directmedia Layer) library audio
-    output driver
-
-    <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
-
-    <device>
-        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=<filename>
-        output filename
-
 null
     Produces no audio output but maintains video playback speed. Use
     ``--nosound`` for benchmarking.
@@ -147,6 +111,3 @@ rsound
     port=<number>
         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

DOCS/man/en/mplayer.rst

@@ -4,9 +4,10 @@ mplayer2 manual page
 Synopsis
 ========
 
-| **mplayer** [options] [file|URL|playlist|-]
+| **mplayer** [options] [file|URL|-]
-| **mplayer** [options] file1 [specific options] [file2] [specific options]
+| **mplayer** [options] --playlist=PLAYLIST
-| **mplayer** [options] {group of files and options} [group-specific options]
+| **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
+**mplayer** is a movie player for Linux. It supports a wide variety of video
-architectures, see the documentation). 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

DOCS/man/en/options.rst

@@ -120,7 +120,7 @@
 
 --aspect=<ratio>
     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=<ID>
-    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=<quality>
-    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
+--untimed
-    Prints some statistics on CPU usage and dropped frames at the end of
+    Do not sleep when outputting video frames. Useful for benchmarks when used
-    playback. Use in combination with ``--nosound`` and ``--vo=null`` for
+    with --no-audio.
-    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).
 
 --bluray-angle=<ID>
     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=<percentage>
     Playback will start when the cache has been filled up to <percentage> 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=<number>
     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=<filename>
     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=<options>
     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=<charset>
-    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=<options>
+--no-config=<options>
     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=<time>
     Set the duration of the OSD messages in ms (default: 1000).
 
---osd-fractions=<0-2>
+--osd-fractions
-    Set how fractions of seconds of the current timestamp are printed on the
+    Show OSD times with fractions of seconds.
-    OSD:
-
-    :0: Do not display fractions (default).
-    :1: Show the first two decimals.
-    :2: Show approximate frame count within current second. This frame count
-        is not accurate but only an approximation. For variable fps, the
-        approximation is known to be far off the correct frame count.
 
 --osdlevel=<0-3>
     Specifies which mode the OSD should start in.
@@ -1534,12 +1438,6 @@
     Use the given profile(s), ``--profile=help`` displays a list of the
     defined profiles.
 
---psprobe=<bytecount>
-    When playing an MPEG-PS or MPEG-PES streams, this option lets you specify
-    how many bytes in the stream you want MPlayer to scan in order to identify
-    the video codec used. This option is needed to play EVO or VDR files
-    containing H.264 streams.
-
 --pts-association-mode=<auto|decode|sort>
     Select the method used to determine which container packet timestamp
     corresponds to a particular output frame from the video decoder. Normally
@@ -1726,16 +1624,6 @@
     images may cover the movie window, though. May not work with all video
     output drivers.
 
---rtc
-    Turns on usage of the Linux RTC (realtime clock - ``/dev/rtc``) as timing
-    mechanism. This wakes up the process every 1/1024 seconds to check the
-    current time. Useless with modern Linux kernels configured for desktop use
-    as they already wake up the process with similar accuracy when using
-    normal timed sleep.
-
---rtc-device=<device>
-    Use the specified device for RTC timing.
-
 --rtsp-destination
     Used with ``rtsp://`` URLs to force the destination IP address to be
     bound. This option may be useful with some RTSP server which do not send
@@ -1793,7 +1681,7 @@
     Display the subtitle stream specified by <ID> (0-31). MPlayer prints the
     available subtitle IDs when run in verbose (``-v``) mode. If you cannot
     select one of the subtitles on a DVD, try ``--vobsubid``.
-    See also ``--slang``, ``--vobsubid``, ``--nosub``.
+    See also ``--slang``, ``--vobsubid``, ``--no-sub``.
 
 --slang=<languagecode[,languagecode,...]>
     Specify a priority list of subtitle languages to use. Different container
@@ -1833,9 +1721,9 @@
     timing is imprecise and you cannot use the RTC either. Comes at the
     price of higher CPU consumption.
 
---softvol
+--no-softvol
-    Force the use of the software mixer, instead of using the sound card
+    Try to use the sound card mixer (if available), instead of using the volume
-    mixer.
+    audio filter.
 
 --softvol-max=<10.0-10000.0>
     Set the maximum amplification level in percent (default: 110). A value of
@@ -1969,13 +1857,6 @@
     :1: Align subtitle center.
     :2: Align subtitle bottom edge (default).
 
---subcc=<1-4>
-    Display DVD Closed Caption (CC) subtitles from the specified channel.
-    These are *not* the VOB subtitles, these are special ASCII subtitles for
-    the hearing impaired encoded in the VOB userdata stream on most region 1
-    DVDs. CC subtitles have not been spotted on DVDs from other regions so
-    far.
-
 --subcp=<codepage>
     If your system supports ``iconv(3)``, you can use this option to specify
     the subtitle codepage.
@@ -2089,22 +1970,7 @@
     the line used for the OSD and clear it (default: ``^[[A\r^[[K``).
 
 --title
-    Set the window title. Supported by X11-based video output drivers.
+    Set the window title. The string can contain property names.
-    See also ``--use-filename-title``.
-
---tskeepbroken
-    Tells MPlayer not to discard TS packets reported as broken in the stream.
-    Sometimes needed to play corrupted MPEG-TS files.
-
---tsprobe=<bytecount>
-    When playing an MPEG-TS stream, this option lets you specify how many
-    bytes in the stream you want MPlayer to search for the desired audio and
-    video IDs.
-
---tsprog=<1-65534>
-    When playing an MPEG-TS stream, you can specify with this option which
-    program (if present) you want to play. Can be used with ``--vid`` and
-    ``--aid``.
 
 --tv=<option1:option2:...>
     This option tunes various properties of the TV capture module. For
@@ -2342,12 +2208,6 @@
 --unicode
     Tells MPlayer to handle the subtitle file as unicode.
 
---unrarexec=<filename>
-    Specify the path to the unrar executable so MPlayer can use it to access
-    rar-compressed VOBsub files (default: not set, so the feature is off). The
-    path must include the executable's filename, i.e.
-    ``/usr/local/bin/unrar``. Not supported on MingW.
-
 --use-filedir-conf
     Look for a file-specific configuration file in the same directory as the
     file that is being played.
@@ -2449,8 +2309,8 @@
     with ``--softvol``). A value of -1 (the default) will not change the
     volume. See also ``--af=volume``.
 
---vsync
+--no-vsync
-    Enables VBI for the vesa, dfbmga and svga video output drivers.
+    Tries to disable vsync.
 
 --wid=<ID>
     (X11, OpenGL and DirectX only)

DOCS/man/en/vo.rst

@@ -59,13 +59,6 @@ x11 (X11 only)
     Shared memory video output driver without hardware acceleration that works
     whenever X11 is present.
 
-xover (X11 only)
-    Adds X11 support to all overlay based video output drivers. Currently only
-    supported by tdfx_vid.
-
-    <vo_driver>
-        Select the driver to use as source to overlay on top of X11.
-
 vdpau (X11 only)
     Uses the VDPAU interface to display and optionally also decode video.
     Hardware decoding is used with ``--vc=ffmpeg12vdpau``,
@@ -158,25 +151,6 @@ vdpau (X11 only)
     driver implementation may also have limits on the length of maximum
     queuing time or number of queued surfaces that work well or at all.
 
-dga (X11 only)
-    Play video through the XFree86 Direct Graphics Access extension.
-    Considered obsolete.
-
-sdl (SDL only, buggy/outdated)
-    Highly platform independent SDL (Simple Directmedia Layer) library video
-    output driver. Since SDL uses its own X11 layer, MPlayer X11 options do
-    not have any effect on SDL. Note that it has several minor bugs
-    (``--vm``/``--no-vm`` is mostly ignored, ``--fs`` behaves like ``--no-vm``
-    should, window is in top-left corner when returning from fullscreen,
-    panscan is not supported, ...).
-
-    driver=<driver>
-        Explicitly choose the SDL driver to use.
-    (no-)forcexv
-        Use XVideo through the sdl video output driver (default: forcexv).
-    (no-)hwaccel
-        Use hardware accelerated scaler (default: hwaccel).
-
 direct3d (Windows only) (BETA CODE!)
     Video output driver that uses the Direct3D interface (useful for Vista).
 
@@ -202,49 +176,6 @@ corevideo (Mac OS X 10.4 or 10.3.9 with QuickTime 7)
         the NSConnection MPlayer will try to open (default: "mplayerosx").
         Setting buffer_name implicitly enables shared_buffer.
 
-fbdev (Linux only)
-    Uses the kernel framebuffer to play video.
-
-    <device>
-        Explicitly choose the fbdev device name to use (e.g. ``/dev/fb0``).
-
-fbdev2 (Linux only)
-    Uses the kernel framebuffer to play video, alternative implementation.
-
-    <device>
-        Explicitly choose the fbdev device name to use (default: ``/dev/fb0``).
-
-vesa
-    Very general video output driver that should work on any VESA VBE 2.0
-    compatible card.
-
-    (no-)dga
-        Turns DGA mode on or off (default: on).
-    neotv_pal
-        Activate the NeoMagic TV out and set it to PAL norm.
-    neotv_ntsc
-        Activate the NeoMagic TV out and set it to NTSC norm.
-    lvo
-        Activate the Linux Video Overlay on top of VESA mode.
-
-svga
-    Play video using the SVGA library.
-
-    <video mode>
-        Specify video mode to use. The mode can be given in a
-        <width>x<height>x<colors> format, e.g. 640x480x16M or be a graphics
-        mode number, e.g. 84.
-    bbosd
-        Draw OSD into black bands below the movie (slower).
-    native
-        Use only native drawing functions. This avoids direct rendering, OSD
-        and hardware acceleration.
-    retrace
-        Force frame switch on vertical retrace. Usable only with ``--double``.
-        It has the same effect as the ``--vsync`` option.
-    sq
-        Try to select a video mode with square pixels.
-
 gl
     OpenGL video output driver, simple version. Video size must be smaller
     than the maximum texture size of your OpenGL implementation. Intended to
@@ -433,35 +364,9 @@ gl
 null
     Produces no video output. Useful for benchmarking.
 
-aa
-    ASCII art video output driver that works on a text console. You can get a
-    list and an explanation of available suboptions by executing ``mplayer
-    --vo=aa:help``.
-
-    *NOTE*: The driver does not handle ``--aspect`` correctly.
-
-    *HINT*: You probably have to specify ``--monitorpixelaspect``. Try
-    ``mplayer --vo=aa --monitorpixelaspect=0.5``.
-
 caca
     Color ASCII art video output driver that works on a text console.
 
-bl
-    Video playback using the Blinkenlights UDP protocol. This driver is highly
-    hardware specific.
-
-    <subdevice>
-        Explicitly choose the Blinkenlights subdevice driver to use. It is
-        something like ``arcade:host=localhost:2323`` or
-        ``hdl:file=name1,file=name2``. You must specify a subdevice.
-
-ggi
-    GGI graphics system video output driver
-
-    <driver>
-        Explicitly choose the GGI driver to use. Replace any ',' that would
-        appear in the driver string by a '.'.
-
 directfb
     Play video using the DirectFB library.
 
@@ -484,117 +389,6 @@ directfb
     dfbopts=<list>
         Specify a parameter list for DirectFB.
 
-dfbmga
-    Matrox G400/G450/G550 specific video output driver that uses the DirectFB
-    library to make use of special hardware features. Enables CRTC2 (second
-    head), displaying video independently of the first head.
-
-    (no-)input
-        same as directfb (default: disabled)
-    buffermode=single|double|triple
-        same as directfb (default: triple)
-    fieldparity=top|bottom
-        same as directfb
-    (no-)bes
-        Enable the use of the Matrox BES (backend scaler) (default: disabled).
-        Gives very good results concerning speed and output quality as
-        interpolated picture processing is done in hardware. Works only on the
-        primary head.
-    (no-)spic
-        Make use of the Matrox sub picture layer to display the OSD (default:
-        enabled).
-    (no-)crtc2
-        Turn on TV-out on the second head (default: enabled). The output
-        quality is amazing as it is a full interlaced picture with proper sync
-        to every odd/even field.
-    tvnorm=pal|ntsc|auto
-        Will set the TV norm of the Matrox card without the need for modifying
-        ``/etc/directfbrc`` (default: disabled). Valid norms are pal = PAL,
-        ntsc = NTSC. Special norm is auto (auto-adjust using PAL/NTSC) because
-        it decides which norm to use by looking at the framerate of the movie.
-
-mga (Linux only)
-    Matrox specific video output driver that makes use of the YUV back end
-    scaler on Gxxx cards through a kernel module. If you have a Matrox card,
-    this is the fastest option.
-
-    <device>
-        Explicitly choose the Matrox device name to use (default:
-        ``/dev/mga_vid``).
-
-xmga (Linux, X11 only)
-    The mga video output driver, running in an X11 window.
-
-    <device>
-        Explicitly choose the Matrox device name to use (default:
-        ``/dev/mga_vid``).
-
-s3fb (Linux only) (see also ``--dr``)
-    S3 Virge specific video output driver. This driver supports the card's YUV
-    conversion and scaling, double buffering and direct rendering features.
-    Use ``--vf=format=yuy2`` to get hardware-accelerated YUY2 rendering, which
-    is much faster than YV12 on this card.
-
-    <device>
-        Explicitly choose the fbdev device name to use (default: ``/dev/fb0``).
-
-wii (Linux only)
-    Nintendo Wii/GameCube specific video output driver.
-
-3dfx (Linux only)
-    3dfx-specific video output driver that directly uses the hardware on top
-    of X11. Only 16 bpp are supported.
-
-tdfxfb (Linux only)
-    This driver employs the tdfxfb framebuffer driver to play movies with YUV
-    acceleration on 3dfx cards.
-
-    <device>
-        Explicitly choose the fbdev device name to use (default: ``/dev/fb0``).
-
-tdfx_vid (Linux only)
-    3dfx-specific video output driver that works in combination with the
-    tdfx_vid kernel module.
-
-    <device>
-        Explicitly choose the device name to use (default: ``/dev/tdfx_vid``).
-
-dxr3 (DXR3 only)
-    Sigma Designs em8300 MPEG decoder chip (Creative DXR3, Sigma Designs
-    Hollywood Plus) specific video output driver. See also the lavc video
-    filter.
-
-    overlay
-        Activates the overlay instead of TV-out.
-    prebuf
-        Turns on prebuffering.
-    sync
-        Will turn on the new sync-engine.
-    norm=<norm>
-        Specifies the TV norm.
-
-        :0: Does not change current norm (default).
-        :1: Auto-adjust using PAL/NTSC.
-        :2: Auto-adjust using PAL/PAL-60.
-        :3: PAL
-        :4: PAL-60
-        :5: NTSC
-
-    <0-3>
-        Specifies the device number to use if you have more than one em8300
-        card.
-
-ivtv (IVTV only)
-    Conexant CX23415 (iCompression iTVC15) or Conexant CX23416 (iCompression
-    iTVC16) MPEG decoder chip (Hauppauge WinTV PVR-150/250/350/500) specific
-    video output driver for TV-out. See also the lavc video filter.
-
-    <device>
-        Explicitly choose the MPEG decoder device name to use (default:
-        ``/dev/video16``).
-    <output>
-        Explicitly choose the TV-out output to be used for the video signal.
-
 v4l2 (requires Linux 2.6.22+ kernel)
     Video output driver for V4L2 compliant cards with built-in hardware MPEG
     decoder. See also the lavc video filter.
@@ -605,17 +399,6 @@ v4l2 (requires Linux 2.6.22+ kernel)
     <output>
         Explicitly choose the TV-out output to be used for the video signal.
 
-mpegpes (DVB only)
-    Video output driver for DVB cards that writes the output to an MPEG-PES
-    file if no DVB card is installed.
-
-    card=<1-4>
-        Specifies the device number to use if you have more than one DVB
-        output card (V3 API only, such as 1.x.y series drivers). If not
-        specified MPlayer will search the first usable card.
-    <filename>
-        output filename (default: ``./grab.mpg``)
-
 md5sum
     Calculate MD5 sums of each frame and write them to a file. Supports RGB24
     and YV12 colorspaces. Useful for debugging.