summaryrefslogtreecommitdiffstats
path: root/DOCS/man
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-16 07:30:30 +0200
committerwm4 <wm4@nowhere>2012-10-16 07:30:30 +0200
commit4e89851aa128a614f59ff4885af384a266cb24e6 (patch)
treec6ab9f34ef3e9c1d58f8ec837b93e249e79bdcf6 /DOCS/man
parentf45eab6faea05834c1337175dbe51437707b8d7e (diff)
parent6557f206efeb4569a42f1e4810172bc97fd64619 (diff)
downloadmpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.bz2
mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.xz
Merge branch 'master' into osd_changes
Conflicts: Makefile command.c libvo/gl_common.c libvo/vo_corevideo.m libvo/vo_opengl.c libvo/vo_opengl_old.c libvo/vo_opengl_shaders.glsl sub/ass_mp.c sub/osd_libass.c sub/sd_ass.c
Diffstat (limited to 'DOCS/man')
-rw-r--r--DOCS/man/en/af.rst42
-rw-r--r--DOCS/man/en/ao.rst4
-rw-r--r--DOCS/man/en/changes.rst72
-rw-r--r--DOCS/man/en/encode.rst46
-rw-r--r--DOCS/man/en/input.rst310
-rw-r--r--DOCS/man/en/mplayer-old.18099
-rw-r--r--DOCS/man/en/mpv.rst (renamed from DOCS/man/en/mplayer.rst)132
-rw-r--r--DOCS/man/en/options.rst241
-rw-r--r--DOCS/man/en/vf.rst652
-rw-r--r--DOCS/man/en/vo.rst474
10 files changed, 864 insertions, 9208 deletions
diff --git a/DOCS/man/en/af.rst b/DOCS/man/en/af.rst
index dc0450241f..1fe480dcdc 100644
--- a/DOCS/man/en/af.rst
+++ b/DOCS/man/en/af.rst
@@ -57,7 +57,7 @@ resample[=srate[:sloppy[:type]]]
*EXAMPLE*:
- ``mplayer --af=resample=44100:0:0``
+ ``mpv --af=resample=44100:0:0``
would set the output frequency of the resample filter to 44100Hz using
exact output frequency scaling and linear interpolation.
@@ -200,7 +200,7 @@ equalizer=[g1:g2:g3:...:g10]
*EXAMPLE*:
- ``mplayer --af=equalizer=11:11:10:5:0:-12:0:5:12:12 media.avi``
+ ``mpv --af=equalizer=11:11:10:5:0:-12:0:5:12:12 media.avi``
Would amplify the sound in the upper and lower frequency region while
canceling it almost completely around 1kHz.
@@ -223,13 +223,13 @@ channels=nch[:nr:from1:to1:from2:to2:from3:to3:...]
*EXAMPLE*:
- ``mplayer --af=channels=4:4:0:1:1:0:2:2:3:3 media.avi``
+ ``mpv --af=channels=4:4:0:1:1:0:2:2:3:3 media.avi``
Would change the number of channels to 4 and set up 4 routes that swap
channel 0 and channel 1 and leave channel 2 and 3 intact. Observe that
if media containing two channels was played back, channels 2 and 3
would contain silence but 0 and 1 would still be swapped.
- ``mplayer --af=channels=6:4:0:0:0:1:0:2:0:3 media.avi``
+ ``mpv --af=channels=6:4:0:0:0:1:0:2:0:3 media.avi``
Would change the number of channels to 6 and set up 4 routes that copy
channel 0 to channels 0 to 3. Channel 4 and 5 will contain silence.
@@ -242,7 +242,7 @@ format[=format]
the sign (either 's' for signed or 'u' for unsigned), 'b' denotes the
number of bits per sample (16, 24 or 32) and 'e' denotes the
endianness ('le' means little-endian, 'be' big-endian and 'ne' the
- endianness of the computer MPlayer is running on). Valid values
+ endianness of the computer mpv is running on). Valid values
(amongst others) are: 's16le', 'u32be' and 'u24ne'. Exceptions to this
rule that are also valid format specifiers: u8, s8, floatle, floatbe,
floatne, mulaw, alaw, mpeg2, ac3 and imaadpcm.
@@ -260,7 +260,7 @@ volume[=v[:sc]]
background is gone.
This filter has a second feature: It measures the overall maximum sound
- level and prints out that level when MPlayer exits. This feature currently
+ level and prints out that level when mpv exits. This feature currently
only works with floating-point data, use e.g. ``--af-adv=force=5``, or use
``--af=stats``.
@@ -281,7 +281,7 @@ volume[=v[:sc]]
*EXAMPLE*:
- ``mplayer --af=volume=10.1:0 media.avi``
+ ``mpv --af=volume=10.1:0 media.avi``
Would amplify the sound by 10.1dB and hard-clip if the sound level is
too high.
@@ -306,10 +306,10 @@ pan=n[:L00:L01:L02:...L10:L11:L12:...Ln0:Ln1:Ln2:...]
*EXAMPLE*:
- ``mplayer --af=pan=1:0.5:0.5 media.avi``
+ ``mpv --af=pan=1:0.5:0.5 media.avi``
Would down-mix from stereo to mono.
- ``mplayer --af=pan=3:1:0:0.5:0:1:0.5 media.avi``
+ ``mpv --af=pan=3:1:0:0.5:0:1:0.5 media.avi``
Would give 3 channel output leaving channels 0 and 1 intact, and mix
channels 0 and 1 into output channel 2 (which could be sent to a
subwoofer for example).
@@ -338,7 +338,7 @@ sub[=fc:ch]
*EXAMPLE*:
- ``mplayer --af=sub=100:4 --channels=5 media.avi``
+ ``mpv --af=sub=100:4 --channels=5 media.avi``
Would add a sub-woofer channel with a cutoff frequency of 100Hz to
output channel 4.
@@ -367,7 +367,7 @@ surround[=delay]
*EXAMPLE*:
- ``mplayer --af=surround=15 --channels=4 media.avi``
+ ``mpv --af=surround=15 --channels=4 media.avi``
Would add surround sound decoding with 15ms delay for the sound to the
rear speakers.
@@ -395,7 +395,7 @@ delay[=ch1:ch2:...]
*EXAMPLE*:
- ``mplayer --af=delay=10.5:10.5:0:0:7:0 media.avi``
+ ``mpv --af=delay=10.5:10.5:0:0:7:0 media.avi``
Would delay front left and right by 10.5ms, the two rear channels and
the sub by 0ms and the center channel by 7ms.
@@ -410,14 +410,14 @@ export[=mmapped_file[:nsamples]]
The rest is payload (non-interleaved) 16 bit data.
<mmapped_file>
- file to map data to (default: ``~/.mplayer/mplayer-af_export``)
+ file to map data to (default: ``~/.mpv/mpv-af_export``)
<nsamples>
number of samples per channel (default: 512)
*EXAMPLE*:
- ``mplayer --af=export=/tmp/mplayer-af_export:1024 media.avi``
- Would export 1024 samples per channel to ``/tmp/mplayer-af_export``.
+ ``mpv --af=export=/tmp/mpv-af_export:1024 media.avi``
+ Would export 1024 samples per channel to ``/tmp/mpv-af_export``.
extrastereo[=mul]
(Linearly) increases the difference between left and right channels which
@@ -461,7 +461,7 @@ ladspa=file:label[:controls...]
<controls>
Controls are zero or more floating point values that determine the
behavior of the loaded plugin (for example delay, threshold or gain).
- In verbose mode (add ``-v`` to the MPlayer command line), all
+ In verbose mode (add ``-v`` to the mpv command line), all
available controls and their valid ranges are printed. This eliminates
the use of 'analyseplugin' from the LADSPA SDK.
@@ -516,21 +516,21 @@ scaletempo[=option1:option2:...]
*EXAMPLE*:
- ``mplayer --af=scaletempo --speed=1.2 media.ogg``
+ ``mpv --af=scaletempo --speed=1.2 media.ogg``
Would playback media at 1.2x normal speed, with audio at normal pitch.
Changing playback speed, would change audio tempo to match.
- ``mplayer --af=scaletempo=scale=1.2:speed=none --speed=1.2 media.ogg``
+ ``mpv --af=scaletempo=scale=1.2:speed=none --speed=1.2 media.ogg``
Would playback media at 1.2x normal speed, with audio at normal pitch,
but changing playback speed has no effect on audio tempo.
- ``mplayer --af=scaletempo=stride=30:overlap=.50:search=10 media.ogg``
+ ``mpv --af=scaletempo=stride=30:overlap=.50:search=10 media.ogg``
Would tweak the quality and performace parameters.
- ``mplayer --af=format=floatne,scaletempo media.ogg``
+ ``mpv --af=format=floatne,scaletempo media.ogg``
Would make scaletempo use float code. Maybe faster on some platforms.
- ``mplayer --af=scaletempo=scale=1.2:speed=pitch audio.ogg``
+ ``mpv --af=scaletempo=scale=1.2:speed=pitch audio.ogg``
Would playback audio file at 1.2x normal speed, with audio at normal
pitch. Changing playback speed, would change pitch, leaving audio
tempo at 1.2x.
diff --git a/DOCS/man/en/ao.rst b/DOCS/man/en/ao.rst
index 00dd1e9e6d..412d9ac939 100644
--- a/DOCS/man/en/ao.rst
+++ b/DOCS/man/en/ao.rst
@@ -9,7 +9,7 @@ syntax is:
--ao=<driver1[:suboption1[=value]:...],driver2,...[,]>
Specify a priority list of audio output drivers to be used.
-If the list has a trailing ',' MPlayer will fall back on drivers not contained
+If the list has a trailing ',' mpv will fall back on drivers not contained
in the list. Suboptions are optional and can mostly be omitted.
*NOTE*: See ``--ao=help`` for a list of compiled-in audio output drivers.
@@ -48,7 +48,7 @@ jack
port=<name>
Connects to the ports with the given name (default: physical ports).
name=<client>
- Client name that is passed to JACK (default: MPlayer [<PID>]). Useful
+ Client name that is passed to JACK (default: mpv [<PID>]). Useful
if you want to have certain connections established automatically.
(no-)estimate
Estimate the audio delay, supposed to make the video playback smoother
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index c4fc3a0812..402bdbd336 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -3,10 +3,7 @@
CHANGES FROM OTHER VERSIONS OF MPLAYER
======================================
-xxx: since I don't have a new name yet, I'm referring to this version of mplayer
-as **mplayer3**, I don't intend to use that name.
-
-**mplayer3** is based on mplayer2, which in turn is based on the original
+**mpv** is based on mplayer2, which in turn is based on the original
MPlayer (also called mplayer, mplayer-svn, mplayer1). Many changes
have been made. Some changes are incompatible, or completely change how the
player behaves.
@@ -37,7 +34,7 @@ General changes for mplayer-svn to mplayer2
* General code cleanups
* Many more changes
-General changes for mplayer2 to mplayer3
+General changes for mplayer2 to mpv
----------------------------------------
* Removal of lots of unneeded code to encourage developer activity (less
@@ -51,9 +48,9 @@ General changes for mplayer2 to mplayer3
languages like Arabic should be better supported.
* Cleaned up terminal output (nicer status line, less useless noise)
* Support for playing URLs of popular streaming sites directly
- (e.g. ``mplayer3 https://www.youtube.com/watch?v=...``)
-* Improved OpenGL output (``vo_gl3``)
-* Make ``--softvol`` default (**mplayer3** is not a mixer control panel)
+ (e.g. ``mpv https://www.youtube.com/watch?v=...``)
+* Improved OpenGL output (``vo_opengl``)
+* Make ``--softvol`` default (**mpv** is not a mixer control panel)
* Improved support for .cue files
* Screenshot improvements (can save screenshots as JPG, configurable filenames)
* Removal of teletext support
@@ -87,7 +84,7 @@ Command line switches
``-no-opt``, or better ``--no-opt``.
* Per-file options are not the default anymore. You can explicitly specify
file local options. See ``Usage`` section.
-* Table of renamed switches:
+* Table of renamed/replaced switches:
=================================== ===================================
Old New
@@ -95,25 +92,58 @@ Command line switches
-nosound --no-audio
-use-filename-title --title="${filename}"
-loop 0 --loop=inf
+ -hardframedrop --framedrop=hard
+ -osdlevel --osd-level
+ -delay --audio-delay
+ -subdelay --sub-delay
+ -subpos --sub-pos
+ -forcedsubsonly --sub-forced-only
=================================== ===================================
input.conf and slave commands
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* Table of renamed slave commands:
-
- =================================== ===================================
- Old New
- =================================== ===================================
- pt_step 1 b playlist_next b
- pt_step -1 b playlist_prev b
- pt_clear playlist_clear
- =================================== ===================================
+* Table of renamed input commands:
+
+ This lists only commands that are not always gracefully handled by the
+ internal legacy translation layer. If an input.conf contains any legacy
+ commands, they will be displayed with ``-v`` when it is loaded, and show
+ and the replacement commands.
+
+ Properties containing ``_`` to separate words use ``-`` instead.
+
+ +--------------------------------+----------------------------------------+
+ | Old | New |
+ +================================+========================================+
+ | pt_step 1 [0|1] | playlist_next [weak|force] |
+ | | (translation layer can't deal with |
+ | | whitespace) |
+ +--------------------------------+----------------------------------------+
+ | pt_step -1 [0|1] | playlist_prev [weak|force] (same) |
+ +--------------------------------+----------------------------------------+
+ | switch_ratio [<ratio>] | set aspect <ratio> |
+ | | set aspect 0 (to reset aspect) |
+ +--------------------------------+----------------------------------------+
+ | step_property_osd <prop> <step>| cycle <prop> <step> (wraps), |
+ | <dir> | add <prop> <step> (clamps). |
+ | | <dir> parameter unsupported. Use |
+ | | a negative step instead. |
+ +--------------------------------+----------------------------------------+
+ | step_property <prop> <step> | Prefix cycle or add with no-osd: |
+ | <dur> | no-osd cycle <prop> <step> |
+ +--------------------------------+----------------------------------------+
+ | osd_show_property_text <text> | show_text <text> |
+ | | The property expansion format string |
+ | | syntax slightly changed. |
+ +--------------------------------+----------------------------------------+
+ | osd_show_text | Now does the same as |
+ | | osd_show_property_text. |
+ +--------------------------------+----------------------------------------+
Other
~~~~~
-* The playtree has been removed. **mplayer3**'s internal playlist is a simple and
+* The playtree has been removed. **mpv**'s internal playlist is a simple and
flat list now. This makes the code easier, and makes using it less confusing.
* Slave mode is broken. This mode is entirely insane in the ``old`` versions of
mplayer. A proper slave mode application needed tons of code and hacks to get
@@ -123,7 +153,7 @@ Other
slave mode application, and as such it's virtually impossible to improve
terminal output intended for users without possibly breaking something.
- This is absolutely insane, and **mplayer3** will not try to keep slave mode
+ This is absolutely insane, and **mpv** will not try to keep slave mode
compatible. If you're a developer of a slave mode application, contact us,
and a new and better protocol can be developed.
@@ -152,6 +182,6 @@ Why this fork?
withheld as to not turn this into a rant.
* mplayer-svn rarely merged from mplayer2, and mplayer2 practically stopped
merging from mplayer-svn (not even code cleanups or new features are merged)
-* **mplayer3** intents to continuously merge from mplayer-svn and mplayer2, while
+* **mpv** intents to continuously merge from mplayer-svn and mplayer2, while
speeding up development. There is willingness for significant changes, even
if this means breaking compatibility.
diff --git a/DOCS/man/en/encode.rst b/DOCS/man/en/encode.rst
index 7ebd8e6c01..93b1b84f28 100644
--- a/DOCS/man/en/encode.rst
+++ b/DOCS/man/en/encode.rst
@@ -10,8 +10,8 @@ You can encode files from one format/codec to another using this facility.
--of=<format>
Specifies the output format (overrides autodetection by the extension of
- the file specified by -o).
- See --of=help for a full list of supported formats.
+ the file specified by -o). This can be a comma separated list of possible
+ formats to try. See --of=help for a full list of supported formats.
--ofopts=<options>
Specifies the output format options for libavformat.
@@ -56,8 +56,8 @@ You can encode files from one format/codec to another using this facility.
avoid --oautofps.
--oac=<codec>
- Specifies the output audio codec.
- See --oac=help for a full list of supported codecs.
+ Specifies the output audio codec. This can be a comma separated list of
+ possible codecs to try. See --oac=help for a full list of supported codecs.
--oaoffset=<value>
Shifts audio data by the given time (in seconds) by adding/removing
@@ -86,27 +86,18 @@ You can encode files from one format/codec to another using this facility.
--oacopts-clr
Completely empties the options list.
+--oafirst
+ Force the audio stream to become the first stream in the output. By default
+ the order is unspecified.
+
--ovc=<codec>
- Specifies the output video codec.
- See --ovc=help for a full list of supported codecs.
+ Specifies the output video codec. This can be a comma separated list of
+ possible codecs to try. See --ovc=help for a full list of supported codecs.
--ovoffset=<value>
Shifts video data by the given time (in seconds) by shifting the pts
values.
---ocopyts
- Copies input pts to the output video (not supported by some output
- container formats, e.g. avi). Discontinuities are still fixed.
- By default, audio pts are set to playback time and video pts are
- synchronized to match audio pts, as some output formats do not support
- anything else.
-
---orawts
- Copies input pts to the output video (not supported by some output
- container formats, e.g. avi). In this modem discontinuities are not fixed
- and all pts are passed through as-is. Never seek backwards or use multiple
- input files in this mode!
-
--ovcopts <options>
Specifies the output video codec options for libavcodec.
See --ovcopts=help for a full list of supported options.
@@ -132,3 +123,20 @@ You can encode files from one format/codec to another using this facility.
--ovcopts-clr
Completely empties the options list.
+
+--ovfirst
+ Force the video stream to become the first stream in the output. By default
+ the order is unspecified.
+
+--ocopyts
+ Copies input pts to the output video (not supported by some output
+ container formats, e.g. avi). Discontinuities are still fixed.
+ By default, audio pts are set to playback time and video pts are
+ synchronized to match audio pts, as some output formats do not support
+ anything else.
+
+--orawts
+ Copies input pts to the output video (not supported by some output
+ container formats, e.g. avi). In this modem discontinuities are not fixed
+ and all pts are passed through as-is. Never seek backwards or use multiple
+ input files in this mode!
diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst
new file mode 100644
index 0000000000..74c4929684
--- /dev/null
+++ b/DOCS/man/en/input.rst
@@ -0,0 +1,310 @@
+.. _input:
+
+INPUT.CONF
+==========
+
+The input.conf file consists of a list of key bindings, for example:
+
+| s screenshot # take a screenshot with the s key
+
+Each line maps a key to an input command. Keys are specified with their literal
+value (upper case if combined with ``Shift``), or a name for special keys. For
+example, ``a`` maps to the ``a`` key without shift, and ``A`` maps to ``a``
+with shift.
+
+A list of special keys can be obtained with
+
+| **mplayer** --input=keylist
+
+In general, keys can be combined with ``Shift``, ``Ctrl`` and ``Alt``:
+
+| ctrl+q quit
+
+General input command syntax
+----------------------------
+
+`[Shift+][Ctrl+][Alt+][Meta+]<key> [<prefix>] <command> (<argument>)*`
+
+Newlines always start a new binding. ``#`` starts a comment (outside of quoted
+string arguments). To bind commands to the ``#`` key, ``SHARP`` can be used.
+
+<key> is either the literal character the key produces (ASCII or unicode
+character), or a symbol name.
+
+Arguments are separated by whitespace. This applies even to string arguments.
+For this reason, string arguments should be quoted with ``"``. Inside quotes,
+C style escaping can be used.
+
+Optional arguments can be skipped with ``-``.
+
+List of input commands
+----------------------
+
+ignore
+ Use this to "block" keys that should be unbound, and do nothing. Useful for
+ disabling default bindings, without disabling all bindings with
+ ``--input=default-bindings=no``.
+
+seek <seconds> [relative|absolute|absolute-percent] [default-precise|exact|keyframes]
+ Change the playback position. By default, seeks by a relative amount of
+ seconds.
+
+ The second argument sets the seek mode:
+
+ relative (default)
+ Seek relative to current position (a negative value seeks backwards).
+ absolute
+ Seek to a given time.
+ absolute-percent
+ Seek to agiven percent position.
+
+ The third argument defines how exact the seek is:
+
+ default-precise (default)
+ Follow the default behavior as set by ``--hr-seek``, which by default
+ does imprecise seeks (like ``keyframes``).
+ exact
+ Always do exact/hr/precise seeks (slow).
+ keyframes
+ Always restart playback at keyframe boundaries (fast).
+
+frame_step
+ Basically seek forward by one frame. Actually this plays one frame, then
+ pauses again.
+
+set <property> "<value>"
+ Set the given property to the given value.
+
+add <property> [<value>]
+ Add the given value to the property. On overflow or underflow, clamp the
+ property to the maximum. If <value> is omitted, assume ``1``.
+
+cycle <property> [up|down]
+ Cycle the given property. ``up`` and ``down`` set the cycle direction. On
+ overflow, set the property back to the minimum, on underflow set it to the
+ maximum. If ``up`` or ``down`` is omitted, assume ``up``.
+
+speed_mult <value>
+ Multiply the ``speed`` property by the given value.
+
+screenshot [single|each-frame] [video|window]
+ Take a screenshot.
+
+ First argument:
+
+ <single> (default)
+ Take a single screenshot.
+ <each-frame>
+ Take a screenshot each frame. Issue this command again to stop taking
+ screenshots.
+
+ Second argument:
+
+ <video> (default)
+ Save the video image, in its original resolution. Typically without
+ OSD or subtitles, but the exact behavior depends on the selected video
+ output.
+ <window>
+ Save the contents of the mplayer window. Typically scaled, with OSD and
+ subtitles. The exact behavior depends on the selected video output, and
+ if not support is available, this will act like ``video``.
+
+playlist_next [weak|force]
+ Go to the next entry on the playlist.
+
+ weak (default)
+ If the last file on the playlist is currently played, do nothing.
+ force
+ Terminate playback if there are no more files on the playlist.
+
+playlist_prev [weak|force]
+ Go to the previous entry on the playlist.
+
+ weak (default)
+ If the first file on the playlist is currently played, do nothing.
+ force
+ Terminate playback if the first file is being played.
+
+loadfile "<file>" [replace|append]
+ Load the given file and play it.
+
+ Second argument:
+
+ <replace> (default)
+ Stop playback of the current file, and play the new file immediately.
+ <append>
+ Append the file to the playlist.
+
+loadlist "<playlist>" [replace|append]
+ Load the given playlist file (like ``--playlist``).
+
+playlist_clear
+ Clear the playlist, except the currently played file.
+
+run "<command>"
+ Run the given command with ``/bin/sh -c``. The string is expanded like in
+ ``--playing-msg`` before
+
+quit [<code>]
+ Exit the player using the given exit code.
+
+sub_load "<file>"
+ Load the given subtitle file. It's not selected as current subtitle after
+ loading.
+
+sub_step <skip>
+ Change subtitle timing such, that the subtitle event after the next <skip>
+ subtitle events is displayed. <skip> can be negative to step back.
+
+osd [<level>]
+ Toggle OSD level. If <level> is specified, set the OSD mode
+ (see ``--osd-level`` for valid values).
+
+print_text "<string>"
+ Print text to stdout. The string can contain properties, which are expanded
+ like in ``--playing-msg``.
+
+show_text "<string>" [<duration>] [<level>]
+ Show text on the OSD. The string can contain properties, which are expanded
+ like in ``--playing-msg``. This can be used to show playback time, filename,
+ and so on.
+
+ <duration> is the time in ms to show the message. By default, it uses the
+ same value as ``--osd-duration``.
+
+ <level> is the minimum OSD level to show the text (see ``--osd-level``).
+
+show_progress
+ Show the progress bar, the elapsed time and the total duration of the file
+ on the OSD.
+
+show_chapters
+ Show a list of chapters on the OSD.
+
+show_tracks
+ Show a list of video/audio/subtitle tracks on the OSD.
+
+
+
+Undocumented properties: tv_start_scan, tv_step_channel, tv_step_norm,
+tv_step_chanlist, tv_set_channel, tv_last_channel, tv_set_freq, tv_step_freq,
+tv_set_norm, dvb_set_channel, radio_step_channel, radio_set_channel,
+radio_set_freq, radio_step_freq (all of these should be replaced by properties),
+edl_mark, stop (questionable use), get_property (?), af_switch, af_add, af_del,
+af_clr, af_cmdline, vo_cmdline (experimental).
+
+Input command prefixes
+----------------------
+
+osd-auto (default)
+ Use the default behavior for this command.
+no-osd
+ Do not use any OSD for this command.
+osd-bar
+ If possible, show a bar with this command. Seek commands will show the
+ progress bar, property changing commands may show the newly set value.
+osd-msg
+ If possible, show an OSD message with this command. The seek command shows
+ the current playback time (like ``show_progress``), property changing
+ commands show the newly set value as text.
+osd-msg-bar
+ Combine osd-bar and osd-msg.
+
+
+
+All of these are still overridden by the global ``--osd-level`` settings.
+
+Undocumented prefixes: pausing, pausing_keep, pausing_toggle,
+pausing_keep_force. (Should these be made official?)
+
+Properties
+----------
+
+Properties are used to set mplayer options during runtime, or to query arbitrary
+information. They can be manipulated with the ``set``/``add``/``cycle``
+commands, and retrieved with ``show_text``, or anything else that uses property
+expansion. (See ``--playing-msg`` how properties are expanded.)
+
+``W`` indicates whether the property is generally writeable. If an option
+is referenced, the property should take/return exactly the same values as the
+option.
+
+=========================== = ==================================================
+Name W Comment
+=========================== = ==================================================
+osd-level x see ``--osd-level``
+loop x see ``--loop``
+speed x see ``--speed``
+filename currently played file (path stripped)
+path currently played file (full path)
+media-title filename or libquvi QUVIPROP_PAGETITLE
+demuxer
+stream-path filename (full path) of stream layer filename
+stream-pos x byte position in source stream
+stream-start start byte offset in source stream
+stream-end end position in bytes in source stream
+stream-length length in bytes (${stream-end} - ${stream-start})
+stream-time-pos x time position in source stream (also see time-pos)
+length length of the current file in seconds
+percent-pos x position in current file (0-100)
+time-pos x position in current file in seconds
+chapter x current chapter number
+edition x current MKV edition number
+titles number of DVD titles
+chapters number of chapters
+editions number of MKV editions
+angle current DVD angle
+metadata metadata key/value pairs
+metadata/<key> value of metedata entry <key>
+pause x pause status (bool)
+pts-association-mode x see ``--pts-association-mode``
+hr-seek x see ``--hr-seek``
+volume x current volume (0-100)
+mute x current mute status (bool)
+audio-delay x see ``--audio-delay``
+audio-format audio format (codec tag)
+audio-codec audio codec selected for decoding
+audio-bitrate audio bitrate
+samplerate audio samplerate
+channels number of audio channels
+audio x current audio track (similar to ``--aid``)
+balance x audio channel balance
+fullscreen x see ``--fullscreen``
+deinterlace x deinterlacing, if available (bool)
+colormatrix x see ``--colormatrix``
+colormatrix-input-range x see ``--colormatrix-input-range``
+colormatrix-output-range x see ``--colormatrix-output-range``
+ontop x see ``--ontop``
+rootwin x see ``--rootwin``
+border x see ``--border``
+framedrop x see ``--framedrop``
+gamma x see ``--gamma``
+brightness x see ``--brightness``
+contrast x see ``--contrast``
+saturation x see ``--saturation``
+hue x see ``--hue``
+panscan x see ``--panscan``
+vsync x see ``--vsync``
+video-format video format (integer FourCC)
+video-codec video codec selected for decoding
+video-bitrate video bitrate
+width video width
+height video height
+fps FPS (may contain bogus values)
+aspect x video aspect
+video x current video track (similar to ``--vid``)
+program x switch TS program (write-only)
+sub x current subttitle track (similar to ``--sid``)
+sub-delay x see ``--sub-delay``
+sub-pos x see ``--sub-pos``
+sub-visibility x whether current subtitle is rendered
+sub-forced-only x see ``--sub-forced-only``
+sub-scale x subtitle font size multiplicator
+ass-use-margins x see ``--ass-use-margins``
+ass-vsfilter-aspect-compat x see ``--ass-vsfilter-aspect-compat``
+ass-style-override x see ``--ass-style-override``
+tv-brightness
+tv-contrast
+tv-saturation
+tv-hue
+=========================== = ==================================================
diff --git a/DOCS/man/en/mplayer-old.1 b/DOCS/man/en/mplayer-old.1
deleted file mode 100644
index 92592c7f27..0000000000
--- a/DOCS/man/en/mplayer-old.1
+++ /dev/null
@@ -1,8099 +0,0 @@
-.\" $Revision$
-.\" MPlayer (C) 2000-2010 MPlayer Team
-.\" This man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
-.
-.\" --------------------------------------------------------------------------
-.\" Macro definitions
-.\" --------------------------------------------------------------------------
-.
-.\" define indentation for suboptions
-.nr SS 5
-.\" add new suboption
-.de IPs
-.IP "\\$1" \n(SS
-..
-.\" begin of first level suboptions, end with .RE
-.de RSs
-.RS 10
-..
-.\" begin of 2nd level suboptions
-.de RSss
-.PD 0
-.RS \n(SS+3
-..
-.\" end of 2nd level suboptions
-.de REss
-.RE
-.PD 1
-..
-.
-.\" --------------------------------------------------------------------------
-.\" Title
-.\" --------------------------------------------------------------------------
-.
-.TH MPlayer 1 "2009-03-25" "The MPlayer Project" "The Movie Player"
-.
-.SH NAME
-mplayer \- movie player
-.
-.\" --------------------------------------------------------------------------
-.\" Synopsis
-.\" --------------------------------------------------------------------------
-.
-.SH SYNOPSIS
-.na
-.nh
-.B mplayer
-[options] [file|URL|playlist|\-]
-.
-.br
-.B mplayer
-[options] file1
-[specific options] [file2] [specific options]
-.
-.br
-.B mplayer
-[options]
-{group of files and options}
-[group-specific options]
-.
-.br
-.B mplayer
-[br]://[title][/device]
-[options]
-.
-.br
-.B mplayer
-[dvd|dvdnav]://[title|[start_title]\-end_title][/device]
-[options]
-.
-.br
-.B mplayer
-vcd://track[/device]
-.
-.br
-.B mplayer
-tv://[channel][/input_id]
-[options]
-.
-.br
-.B mplayer
-radio://[channel|frequency][/capture]
-[options]
-.
-.br
-.B mplayer
-pvr://
-[options]
-.
-.br
-.B mplayer
-dvb://[card_number@]channel
-[options]
-.
-.br
-.B mplayer
-mf://[filemask|@listfile]
-[\-mf options] [options]
-.
-.br
-.B mplayer
-[cdda|cddb]://track[\-endtrack][:speed][/device]
-[options]
-.
-.br
-.B mplayer
-cue://file[:track]
-[options]
-.
-.br
-.B mplayer
-[file|mms[t]|http|http_proxy|rt[s]p|ftp|udp|unsv|icyx|noicyx|smb]://
-[user:pass@]URL[:port] [options]
-.
-.br
-.B mplayer
-sdp://file
-[options]
-.
-.br
-.B mplayer
-mpst://host[:port]/URL
-[options]
-.
-.br
-.B mplayer
-tivo://host/[list|llist|fsid]
-[options]
-.ad
-.hy
-.
-.\" --------------------------------------------------------------------------
-.\" Description
-.\" --------------------------------------------------------------------------
-.
-.SH DESCRIPTION