Rename to "mpv"

This changes the name of this project to mpv. Most user-visible mentions
of "MPlayer" and "mplayer" are changed to "mpv". The binary name and the
default config file location are changed as well.

The new default config file location is: ~/.mpv/

Remove etc/mplayer.desktop. Apparently this was for the MPlayer GUI,
which has been removed from mplayer2 ages ago.

We don't have a logo, and the MS Windows resource files sort-of require
one, so leave etc/mplayer.ico/.xpm as-is.

Remove the debian and rpm packaging scripts. These contained outdated
dependencies and likely were more harmful than useful. (Patches which
add working and well-tested packaging are welcome.)

8 files changed, 198 insertions, 211 deletions

diff --git a/DOCS/encoding.rst b/DOCS/encoding.rst
index 67ad19bae6..84b1007afd 100644
--- a/DOCS/encoding.rst
+++ b/DOCS/encoding.rst
@@ -3,15 +3,15 @@ General usage
 
 ::
 
-  mplayer infile -o outfile [-of outfileformat] [-ofopts formatoptions] \
+  mpv infile -o outfile [-of outfileformat] [-ofopts formatoptions] \
     [-ofps outfps | -oautofps] [-oharddup] [-ocopyts | -orawts] [-oneverdrop] \
-    [(any other mplayer options)] \
+    [(any other mpv options)] \
     -ovc outvideocodec [-ovcopts outvideocodecoptions] \
     -oac outaudiocodec [-oacopts outaudiocodecoptions]
 
 Help for these options is provided if giving help as parameter, as in::
 
-  mplayer -ovc help
+  mpv -ovc help
 
 The suboptions of these generally are identical to ffmpeg's (as option parsing
 is simply delegated to ffmpeg). The option -ocopyts enables copying timestamps
@@ -25,7 +25,7 @@ from the input video. Note that not all codecs and not all formats support VFR
 encoding, and some which do have bugs when a target bitrate is specified - use
 -ofps or -oautofps to force CFR encoding in these cases.
 
-Of course, the options can be stored in a profile, like this .mplayer/config
+Of course, the options can be stored in a profile, like this .mpv/config
 section::
 
   [myencprofile]
@@ -40,7 +40,7 @@ section::
 
 One can then encode using this profile using the command::
 
-  mplayer infile -o outfile.mp4 -profile myencprofile
+  mpv infile -o outfile.mp4 -profile myencprofile
 
 Some example profiles are provided in a file
 etc/encoding-example-profiles.conf; as for this, see below.
@@ -54,7 +54,7 @@ for.
 
 Typical MPEG-4 Part 2 ("ASP", "DivX") encoding, AVI container::
 
-  mplayer infile -o outfile.avi \
+  mpv infile -o outfile.avi \
     -ofps 25 \
     -ovc mpeg4 -ovcopts qscale=4 \
     -oac libmp3lame -oacopts ab=128k
@@ -65,19 +65,19 @@ for NTSC)
 
 Typical MPEG-4 Part 10 ("AVC", "H.264") encoding, Matroska (MKV) container::
 
-  mplayer infile -o outfile.mkv \
+  mpv infile -o outfile.mkv \
     -ovc libx264 -ovcopts preset=medium,crf=23,profile=baseline \
     -oac vorbis -oacopts qscale=3
 
 Typical MPEG-4 Part 10 ("AVC", "H.264") encoding, MPEG-4 (MP4) container::
 
-  mplayer infile -o outfile.mp4 \
+  mpv infile -o outfile.mp4 \
     -ovc libx264 -ovcopts preset=medium,crf=23,profile=baseline \
     -oac aac -oacopts ab=128k
 
 Typical VP8 encoding, WebM (restricted Matroska) container::
 
-  mplayer infile -o outfile.mkv \
+  mpv infile -o outfile.mkv \
     -of webm \
     -ovc libvpx -ovcopts qmin=6,b=1000000k \
     -oac libvorbis -oacopts qscale=3
@@ -90,10 +90,10 @@ As the options for various devices can get complex, profiles can be used.
 
 An example profile file for encoding is provided in
 etc/encoding-example-profiles.conf in the source tree. You can include it into
-your configuration by doing, from the mplayer2-build directory::
+your configuration by doing, from the mpv-build directory::
 
-  mkdir -p ~/.mplayer
-  echo "include = $PWD/mplayer/etc/encoding-example-profiles.conf" >> ~/.mplayer/config
+  mkdir -p ~/.mpv
+  echo "include = $PWD/mpv/etc/encoding-example-profiles.conf" >> ~/.mpv/config
 
 Refer to the top of that file for more comments - in a nutshell, the following
 options are added by it::
@@ -108,7 +108,7 @@ options are added by it::
 
 You can encode using these with a command line like::
 
-  mplayer infile -o outfile.mp4 -profile enc-to-bb-9000
+  mpv infile -o outfile.mp4 -profile enc-to-bb-9000
 
 Of course, you are free to override options set by these profiles by specifying
 them after the -profile option.
@@ -122,15 +122,15 @@ What works
 * 2-pass encoding (specify flags=+pass1 in the first pass's -ovcopts, specify
   flags=+pass2 in the second pass)
 * Hardcoding subtitles using vobsub, ass or srt subtitle rendering (just
-  configure mplayer for the subtitles as usual)
-* Hardcoding any other mplayer OSD (e.g. time codes, using -osdlevel 3 and -vf
+  configure mpv for the subtitles as usual)
+* Hardcoding any other mpv OSD (e.g. time codes, using -osdlevel 3 and -vf
   expand=::::1)
 * Encoding directly from a DVD, network stream, webcam, or any other source
-  mplayer supports
+  mpv supports
 * Using x264 presets/tunings/profiles (by using profile=, tune=, preset= in the
   -ovcopts)
-* Deinterlacing/Inverse Telecine with any of mplayer's filters for that
-* Audio file converting: mplayer -o outfile.mp3 infile.flac -novideo -oac
+* Deinterlacing/Inverse Telecine with any of mpv's filters for that
+* Audio file converting: mpv -o outfile.mp3 infile.flac -novideo -oac
   libmp3lame -oacopts ab=320k
 * inverse telecine filters (confirmed working: detc, pullup, filmdint)
 
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 cdbfb8f0ab..5b1c3ea4a6 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=...``)
+  (e.g. ``mpv https://www.youtube.com/watch?v=...``)
 * Improved OpenGL output (``vo_opengl``)
-* Make ``--softvol`` default (**mplayer3** is not a mixer control panel)
+* 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
@@ -113,7 +110,7 @@ input.conf and slave commands
 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 +120,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 +149,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/mplayer.rst b/DOCS/man/en/mpv.rst
index 89b03737c3..2cca30c383 100644
--- a/DOCS/man/en/mplayer.rst
+++ b/DOCS/man/en/mpv.rst
@@ -1,32 +1,32 @@
-mplayer2 manual page
+mpv manual page
 ####################
 
 Synopsis
 ========
 
-| **mplayer** [options] [file|URL|-]
-| **mplayer** [options] --playlist=PLAYLIST
-| **mplayer** [options] files
-| **mplayer** [options] {group of files and options}
-| **mplayer** [bd]://[title][/device] [options]
-| **mplayer** dvd://[title|[start\_title]-end\_title][/device] [options]
-| **mplayer** \vcd://track[/device]
-| **mplayer** \tv://[channel][/input_id] [options]
-| **mplayer** radio://[channel|frequency][/capture] [options]
-| **mplayer** \pvr:// [options]
-| **mplayer** \dvb://[card\_number@]channel [options]
-| **mplayer** \mf://[filemask|\@listfile] [-mf options] [options]
-| **mplayer** [cdda|cddb]://track[-endtrack][:speed][/device] [options]
-| **mplayer** [file|mms[t]|http|http\_proxy|rt[s]p|ftp|udp|unsv|icyx|noicyx|smb]:// [user:pass\@]URL[:port] [options]
-| **mplayer** \sdp://file [options]
-| **mplayer** \mpst://host[:port]/URL [options]
-| **mplayer** \tivo://host/[list|llist|fsid] [options]
+| **mpv** [options] [file|URL|-]
+| **mpv** [options] --playlist=PLAYLIST
+| **mpv** [options] files
+| **mpv** [options] {group of files and options}
+| **mpv** [bd]://[title][/device] [options]
+| **mpv** dvd://[title|[start\_title]-end\_title][/device] [options]
+| **mpv** \vcd://track[/device]
+| **mpv** \tv://[channel][/input_id] [options]
+| **mpv** radio://[channel|frequency][/capture] [options]
+| **mpv** \pvr:// [options]
+| **mpv** \dvb://[card\_number@]channel [options]
+| **mpv** \mf://[filemask|\@listfile] [-mf options] [options]
+| **mpv** [cdda|cddb]://track[-endtrack][:speed][/device] [options]
+| **mpv** [file|mms[t]|http|http\_proxy|rt[s]p|ftp|udp|unsv|icyx|noicyx|smb]:// [user:pass\@]URL[:port] [options]
+| **mpv** \sdp://file [options]
+| **mpv** \mpst://host[:port]/URL [options]
+| **mpv** \tivo://host/[list|llist|fsid] [options]
 
 
 DESCRIPTION
 ===========
 
-**mplayer** is a movie player for Linux. It supports a wide variety of video
+**mpv** is a movie player based on MPlayer and mplayer2. 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
@@ -39,8 +39,8 @@ page.
 INTERACTIVE CONTROL
 ===================
 
-MPlayer has a fully configurable, command-driven control layer which allows you
-to control MPlayer using keyboard, mouse, joystick or remote control (with
+mpv has a fully configurable, command-driven control layer which allows you
+to control mpv using keyboard, mouse, joystick or remote control (with
 LIRC). See the ``--input`` option for ways to customize it.
 
 keyboard control
@@ -283,9 +283,9 @@ the *XXX* option or if *XXX* is compiled in.
 | It has the following format:
 | %n%string\_of\_length\_n
 | *EXAMPLES*:
-| `mplayer --ao pcm:file=%10%C:test.wav test.avi`
+| `mpv --ao pcm:file=%10%C:test.wav test.avi`
 | Or in a script:
-| `mplayer --ao pcm:file=%\`expr length "$NAME"\`%"$NAME" test.avi`
+| `mpv --ao pcm:file=%\`expr length "$NAME"\`%"$NAME" test.avi`
 
 
 Per-file options
@@ -294,7 +294,7 @@ Per-file options
 When playing multiple files, any option given on the command line usually
 affects all files. Example:
 
-`mplayer --a file1.mkv --b file2.mkv --c`
+`mpv --a file1.mkv --b file2.mkv --c`
 
 +-----------+-------------------------+
 | File      | Active options          |
@@ -311,7 +311,7 @@ Sometimes, it's useful to change options per-file. This can be achieved by
 adding the special per-file markers `--{` and `--}`. (Note that you must
 escape these on some shells.) Example:
 
-`mplayer --a file1.mkv --b --\\\{ --c file2.mkv --d file3.mkv --e --\\\} file4.mkv --f`
+`mpv --a file1.mkv --b --\\\{ --c file2.mkv --d file3.mkv --e --\\\} file4.mkv --f`
 
 +-----------+-------------------------+
 | File      | Active options          |
@@ -334,9 +334,9 @@ CONFIGURATION FILES
 ===================
 
 You can put all of the options in configuration files which will be read every
-time MPlayer is run. The system-wide configuration file 'mplayer.conf' is in
-your configuration directory (e.g. ``/etc/mplayer`` or
-``/usr/local/etc/mplayer``), the user specific one is ``~/.mplayer/config``.
+time mpv is run. The system-wide configuration file 'mpv.conf' is in
+your configuration directory (e.g. ``/etc/mpv`` or
+``/usr/local/etc/mpv``), the user specific one is ``~/.mpv/config``.
 User specific options override system-wide options and options given on the
 command line override either. The syntax of the configuration files is
 ``option=<value>``, everything after a *#* is considered a comment. Options
@@ -347,16 +347,16 @@ can be specified in this way.
 You can also write file-specific configuration files. If you wish to have a
 configuration file for a file called 'movie.avi', create a file named
 'movie.avi.conf' with the file-specific options in it and put it in
-``~/.mplayer/``. You can also put the configuration file in the same directory
+``~/.mpv/``. You can also put the configuration file in the same directory
 as the file to be played, as long as you give the ``--use-filedir-conf``
 option (either on the command line or in your global config file). If a
 file-specific configuration file is found in the same directory, no
-file-specific configuration is loaded from ``~/.mplayer``. In addition, the
+file-specific configuration is loaded from ``~/.mpv``. In addition, the
 ``--use-filedir-conf`` option enables directory-specific configuration files.
-For this, MPlayer first tries to load a mplayer.conf from the same directory
+For this, mpv first tries to load a mpv.conf from the same directory
 as the file played and then tries to load any file-specific configuration.
 
-*EXAMPLE MPLAYER CONFIGURATION FILE:*
+*EXAMPLE MPV CONFIGURATION FILE:*
 
 | # Use gl3 video output by default.
 | vo=gl3
@@ -379,7 +379,7 @@ description (shown by ``--profile=help``) can be defined with the profile-desc
 option. To end the profile, start another one or use the profile name
 *default* to continue with normal options.
 
-*EXAMPLE MPLAYER PROFILE:*
+*EXAMPLE MPV PROFILE:*
 
 | [protocol.dvd]
 | profile-desc="profile for dvd:// streams"
@@ -438,22 +438,22 @@ ENVIRONMENT VARIABLES
 =====================
 
 There are a number of environment variables that can be used to control the
-behavior of MPlayer.
+behavior of mpv.
 
-``MPLAYER_CHARSET`` (see also ``--msgcharset``)
+``MPV_CHARSET`` (see also ``--msgcharset``)
     Convert console messages to the specified charset (default: autodetect). A
     value of "noconv" means no conversion.
 
-``MPLAYER_HOME``
-    Directory where MPlayer looks for user settings.
+``MPV_HOME``
+    Directory where mpv looks for user settings.
 
-``MPLAYER_LOCALEDIR``
-    Directory where MPlayer looks for gettext translation files (if enabled).
+``MPV_LOCALEDIR``
+    Directory where mpv looks for gettext translation files (if enabled).
 
-``MPLAYER_VERBOSE`` (see also ``-v`` and ``--msglevel``)
+``MPV_VERBOSE`` (see also ``-v`` and ``--msglevel``)
     Set the initial verbosity level across all message modules (default: 0).
     The resulting verbosity corresponds to that of ``--msglevel=5`` plus the
-    value of ``MPLAYER_VERBOSE``.
+    value of ``MPV_VERBOSE``.
 
 libaf:
     ``LADSPA_PATH``
@@ -595,58 +595,58 @@ libavformat:
 FILES
 =====
 
-``/usr/local/etc/mplayer/mplayer.conf``
-    MPlayer system-wide settings
+``/usr/local/etc/mpv/mpv.conf``
+    mpv system-wide settings
 
-``~/.mplayer/config``
-    MPlayer user settings
+``~/.mpv/config``
+    mpv user settings
 
-``~/.mplayer/input.conf``
+``~/.mpv/input.conf``
     input bindings (see ``--input=keylist`` for the full list)
 
-``~/.mplayer/DVDkeys/``
+``~/.mpv/DVDkeys/``
     cached CSS keys
 
 
-EXAMPLES OF MPLAYER USAGE
+EXAMPLES OF MPV USAGE
 =========================
 
 Quickstart Blu-ray playing:
-    - ``mplayer bd:////path/to/disc``
-    - ``mplayer bd:// --bluray-device=/path/to/disc``
+    - ``mpv bd:////path/to/disc``
+    - ``mpv bd:// --bluray-device=/path/to/disc``
 
 Quickstart DVD playing:
-    ``mplayer dvd://1``
+    ``mpv dvd://1``
 
 Play in Japanese with English subtitles:
-    ``mplayer dvd://1 --alang=ja --slang=en``
+    ``mpv dvd://1 --alang=ja --slang=en``
 
 Play only chapters 5, 6, 7:
-    ``mplayer dvd://1 --chapter=5-7``
+    ``mpv dvd://1 --chapter=5-7``
 
 Play only titles 5, 6, 7:
-    ``mplayer dvd://5-7``
+    ``mpv dvd://5-7``
 
 Play a multiangle DVD:
-    ``mplayer dvd://1 --dvdangle=2``
+    ``mpv dvd://1 --dvdangle=2``
 
 Play from a different DVD device:
-    ``mplayer dvd://1 --dvd-device=/dev/dvd2``
+    ``mpv dvd://1 --dvd-device=/dev/dvd2``
 
 Play DVD video from a directory with VOB files:
-    ``mplayer dvd://1 --dvd-device=/path/to/directory/``
+    ``mpv dvd://1 --dvd-device=/path/to/directory/``
 
 Stream from HTTP:
-    ``mplayer http://mplayer.hq/example.avi``
+    ``mpv http://mpv.hq/example.avi``
 
 Stream using RTSP:
-    ``mplayer rtsp://server.example.com/streamName``
+    ``mpv rtsp://server.example.com/streamName``
 
 input from standard V4L:
-    ``mplayer tv:// --tv=driver=v4l:width=640:height=480:outfmt=i420 --vc=rawi420 --vo=xv``
+    ``mpv tv:// --tv=driver=v4l:width=640:height=480:outfmt=i420 --vc=rawi420 --vo=xv``
 
 Play DTS-CD with passthrough:
-    ``mplayer --ac=hwdts --rawaudio=format=0x2001 --cdrom-device=/dev/cdrom cdda://``
+    ``mpv --ac=hwdts --rawaudio=format=0x2001 --cdrom-device=/dev/cdrom cdda://``
 
     You can also use ``--afm=hwac3`` instead of ``--ac=hwdts``. Adjust
     ``/dev/cdrom`` to match the CD-ROM device on your system. If your external
@@ -654,21 +654,23 @@ Play DTS-CD with passthrough:
     ``cdda://`` without setting format, hwac3 or hwdts.
 
 Play a 6-channel AAC file with only two speakers:
-    ``mplayer --rawaudio=format=0xff --demuxer=rawaudio --af=pan=2:.32:.32:.39:.06:.06:.39:.17:-.17:-.17:.17:.33:.33 adts_he-aac160_51.aac``
+    ``mpv --rawaudio=format=0xff --demuxer=rawaudio --af=pan=2:.32:.32:.39:.06:.06:.39:.17:-.17:-.17:.17:.33:.33 adts_he-aac160_51.aac``
 
     You might want to play a bit with the pan values (e.g multiply with a
     value) to increase volume or avoid clipping.
 
 checkerboard invert with geq filter:
-    ``mplayer --vf=geq='128+(p(X\,Y)-128)*(0.5-gt(mod(X/SW\,128)\,64))*(0.5-gt(mod(Y/SH\,128)\,64))*4'``
+    ``mpv --vf=geq='128+(p(X\,Y)-128)*(0.5-gt(mod(X/SW\,128)\,64))*(0.5-gt(mod(Y/SH\,128)\,64))*4'``
 
 
 AUTHORS
 =======
 
+mpv is a MPlayer fork based on mplayer2, which in turn is a fork of MPlayer.
+
 MPlayer was initially written by Arpad Gereoffy. See the ``AUTHORS`` file for
 a list of some of the many other contributors.
 
-MPlayer is (C) 2000-2011 The MPlayer Team
+MPlayer is (C) 2000-2012 The MPlayer Team
 
 This man page was written mainly by Gabucino, Jonas Jermann and Diego Biurrun.
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index c52c8b307e..dbac793fa9 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -14,7 +14,7 @@
     Specify a priority list of audio codecs to be used, according to their
     codec name in codecs.conf. Use a '-' before the codec name to omit it.
     Use a '+' before the codec name to force it, this will likely crash! If
-    the list has a trailing ',' MPlayer will fall back on codecs not contained
+    the list has a trailing ',' mpv will fall back on codecs not contained
     in the list.
 
     *NOTE*: See ``--ac=help`` for a full list of available codecs.
@@ -58,7 +58,7 @@
             may silently fail, and the sound quality may drop.
         3
             Use no automatic insertion of filters and no optimization.
-            *Warning*: It may be possible to crash MPlayer using this setting.
+            *Warning*: It may be possible to crash mpv using this setting.
         4
             Use automatic insertion of filters according to 0 above, but use
             floating point processing when possible.
@@ -95,15 +95,15 @@
     Specify a priority list of audio languages to use. Different container
     formats employ different language codes. DVDs use ISO 639-1 two letter
     language codes, Matroska, MPEG-TS and NUT use ISO 639-2 three letter
-    language codes while OGM uses a free-form identifier. MPlayer prints the
+    language codes while OGM uses a free-form identifier. mpv prints the
     available languages when run in verbose (``-v``) mode. See also ``--aid``.
 
     *EXAMPLE*:
 
-    ``mplayer dvd://1 --alang=hu,en``
+    ``mpv dvd://1 --alang=hu,en``
         Chooses the Hungarian language track on a DVD and falls back on
         English if Hungarian is not available.
-    ``mplayer --alang=jpn example.mkv``
+    ``mpv --alang=jpn example.mkv``
         Plays a Matroska file in Japanese.
 
 --ao=<driver1[:suboption1[=value]:...],driver2,...[,]>
@@ -245,11 +245,11 @@
 
 --bluray-angle=<ID>
     Some Blu-ray discs contain scenes that can be viewed from multiple angles.
-    Here you can tell MPlayer which angles to use (default: 1).
+    Here you can tell mpv which angles to use (default: 1).
 
 --bluray-chapter=<ID>
     (Blu-ray only)
-    Tells MPlayer which Blu-ray chapter to start the current title from
+    Tells mpv which Blu-ray chapter to start the current title from
     (default: 1).
 
 --bluray-device=<path>
@@ -278,12 +278,12 @@
 
 --cache-seek-min=<percentage>
     If a seek is to be made to a position within <percentage> of the cache
-    size from the current position, MPlayer will wait for the cache to be
+    size from the current position, mpv will wait for the cache to be
     filled to this position rather than performing a stream seek (default:
     50).
 
 --cdda=<option1:option2>
-    This option can be used to tune the CD Audio reading feature of MPlayer.
+    This option can be used to tune the CD Audio reading feature of mpv.
 
     Available options are:
 
@@ -323,7 +323,7 @@
     Specify the CD-ROM device (default: ``/dev/cdrom``).
 
 --channels=<number>
-    Request the number of playback channels (default: 2). MPlayer asks the
+    Request the number of playback channels (default: 2). mpv asks the
     decoder to decode the audio into as many channels as specified. Then it is
     up to the decoder to fulfill the requirement. This is usually only
     important when playing videos with AC-3 audio (like DVDs). In that case
@@ -457,7 +457,7 @@
     assumed to be in Netscape format.
 
 --correct-pts, --no-correct-pts
-    Switches MPlayer to a mode where timestamps for video frames are
+    Switches mpv to a mode where timestamps for video frames are
     calculated differently and video filters which add new frames or modify
     timestamps of existing ones are supported. Now enabled automatically for
     most common file formats. The more accurate timestamps can be visible for
@@ -502,10 +502,10 @@
     override the default ones:
 
     :card=<1-4>:      Specifies using card number 1-4 (default: 1).
-    :file=<filename>: Instructs MPlayer to read the channels list from
+    :file=<filename>: Instructs mpv to read the channels list from
                       <filename>. Default is
-                      ``~/.mplayer/channels.conf.{sat,ter,cbl,atsc}`` (based
-                      on your card type) or ``~/.mplayer/channels.conf`` as a
+                      ``~/.mpv/channels.conf.{sat,ter,cbl,atsc}`` (based
+                      on your card type) or ``~/.mpv/channels.conf`` as a
                       last resort.
     :timeout=<1-30>:  Maximum number of seconds to wait when trying to tune a
                       frequency before giving up (default: 30).
@@ -519,7 +519,7 @@
     Try to limit DVD speed (default: 0, no change). DVD base speed is 1385
     kB/s, so a 8x drive can read at speeds up to 11080 kB/s. Slower speeds
     make the drive more quiet. For watching DVDs 2700 kB/s should be quiet and
-    fast enough. MPlayer resets the speed to the drive default value on close.
+    fast enough. mpv resets the speed to the drive default value on close.
     Values of at least 100 mean speed in kB/s. Values less than 100 mean
     multiples of 1385 kB/s, i.e. ``--dvd-speed=8`` selects 11080 kB/s.
 
@@ -527,12 +527,12 @@
 
 --dvdangle=<ID>
     Some DVD discs contain scenes that can be viewed from multiple angles.
-    Here you can tell MPlayer which angles to use (default: 1).
+    Here you can tell mpv which angles to use (default: 1).
 
 --edition=<ID>
     (Matroska files only)
     Specify the edition (set of chapters) to use, where 0 is the first. If set
-    to -1 (the default), MPlayer will choose the first edition declared as a
+    to -1 (the default), mpv will choose the first edition declared as a
     default, or if there is no default, the first edition defined.
 
 --edlout=<filename>
@@ -611,16 +611,16 @@
     specify a particular font. See also ``--subfont``. With fontconfig enabled
     the argument is a fontconfig pattern and the default is ``sans``. Without
     fontconfig the argument is a filename and the default is
-    ``~/.mplayer/subfont.ttf``.
+    ``~/.mpv/subfont.ttf``.
 
     *EXAMPLE*:
 
-    - ``--font=~/.mplayer/arialuni.ttf`` (no fontconfig)
+    - ``--font=~/.mpv/arialuni.ttf`` (no fontconfig)
     - ``--font='Bitstream Vera Sans'`` (usual case with fontconfig)
     - ``--font='Bitstream Vera Sans:style=Bold'`` (usual case with fontconfig)
 
 --force-window-position
-    Forcefully move MPlayer's video output window to default location whenever
+    Forcefully move mpv's video output window to default location whenever
     there is a change in video parameters, video stream or file. This used to
     be the default behavior. Currently only affects X11 VOs.
 
@@ -760,7 +760,7 @@
     Command that is executed every 30 seconds during playback via *system()* -
     i.e. using the shell.
 
-    *NOTE*: mplayer uses this command without any checking, it is your
+    *NOTE*: mpv 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 ``--no-video`` but works with
@@ -771,10 +771,10 @@
     complicated, ask the author of the screensaver program to support the
     proper X APIs.
 
-    *EXAMPLE for xscreensaver*: ``mplayer --heartbeat-cmd="xscreensaver-command
+    *EXAMPLE for xscreensaver*: ``mpv --heartbeat-cmd="xscreensaver-command
     -deactivate" file``
 
-    *EXAMPLE for GNOME screensaver*: ``mplayer
+    *EXAMPLE for GNOME screensaver*: ``mpv
     --heartbeat-cmd="gnome-screensaver-command -p" file``
 
 --help
@@ -821,7 +821,7 @@
 
     *EXAMPLE*:
 
-            ``mplayer --http-header-fields='Field1: value1','Field2: value2' http://localhost:1234``
+            ``mpv --http-header-fields='Field1: value1','Field2: value2' http://localhost:1234``
 
         Will generate HTTP request:
 
@@ -845,12 +845,12 @@
     by using ``--msglevel=identify=6``. For example, for a DVD or Blu-ray it
     will list the chapters and time length of each title, as well as a disk
     ID. Combine this with ``--frames=0`` to suppress all video output. The
-    wrapper script ``TOOLS/midentify.sh`` suppresses the other MPlayer output
+    wrapper script ``TOOLS/midentify.sh`` suppresses the other mpv output
     and (hopefully) shellescapes the filenames.
 
 --idle
-    Makes MPlayer wait idly instead of quitting when there is no file to play.
-    Mostly useful in slave mode where MPlayer can be controlled through input
+    Makes mpv wait idly instead of quitting when there is no file to play.
+    Mostly useful in slave mode where mpv can be controlled through input
     commands (see also ``--slave``).
 
 --idx
@@ -874,17 +874,17 @@
     Specify configuration file to be parsed after the default ones.
 
 --initial-audio-sync, --no-initial-audio-sync
-    When starting a video file or after events such as seeking MPlayer will by
+    When starting a video file or after events such as seeking mpv will by
     default modify the audio stream to make it start from the same timestamp
     as video, by either inserting silence at the start or cutting away the
     first samples. Disabling this option makes the player behave like older
-    MPlayer versions did: video and audio are both started immediately even if
+    mpv versions did: video and audio are both started immediately even if
     their start timestamps differ, and then video timing is gradually adjusted
     if necessary to reach correct synchronization later.
 
 --input=<commands>
     This option can be used to configure certain parts of the input system.
-    Paths are relative to ``~/.mplayer/``.
+    Paths are relative to ``~/.mpv/``.
 
     *NOTE*: Autorepeat is currently only supported by joysticks.
 
@@ -892,7 +892,7 @@
 
     conf=<filename>
         Specify input configuration file other than the default
-        ``~/.mplayer/input.conf``. ``~/.mplayer/<filename>`` is assumed if no
+        ``~/.mpv/input.conf``. ``~/.mpv/<filename>`` is assumed if no
         full path is given.
 
     ar-dev=<device>
@@ -907,7 +907,7 @@
         Number of key presses to generate per second on autorepeat.
 
     (no)default-bindings
-        Use the key bindings that MPlayer ships with by default.
+        Use the key bindings that mpv ships with by default.
 
     keylist
         Prints all keys that can be bound to commands.
@@ -922,7 +922,7 @@
         Read commands from the given file. Mostly useful with a FIFO.
         See also ``--slave``.
 
-        *NOTE*: When the given file is a FIFO MPlayer opens both ends so you
+        *NOTE*: When the given file is a FIFO mpv opens both ends so you
         can do several `echo "seek 10" > mp_pipe` and the pipe will stay
         valid.
 
@@ -935,7 +935,7 @@
 
 --keepaspect, --no-keepaspect
     Keep window aspect ratio when resizing windows. Enabled by default. By
-    default MPlayer tries to keep the correct video aspect ratio by
+    default mpv tries to keep the correct video aspect ratio by
     instructing the window manager to maintain window aspect when resizing,
     and by adding black bars if the window manager nevertheless allows window
     shape to change. --no-keepaspect disables window manager aspect hints and
@@ -1106,7 +1106,7 @@
         Note, a patch to make the *o=* unneeded and pass all unknown options
         through the AVOption system is welcome. A full list of AVOptions can
         be found in the FFmpeg manual. Note that some options may conflict
-        with MPlayer options.
+        with mpv options.
 
         *EXAMPLE*: ``o=fflags=+ignidx``
     probesize=<value>
@@ -1133,11 +1133,11 @@
 --loadidx=<filename>
     The file from which to read the video index data saved by ``--saveidx``.
     This index will be used for seeking, overriding any index data contained
-    in the AVI itself. MPlayer will not prevent you from loading an index file
+    in the AVI itself. mpv will not prevent you from loading an index file
     generated from a different AVI, but this is sure to cause unfavorable
     results.
 
-    *NOTE*: This option is obsolete now that MPlayer has OpenDML support.
+    *NOTE*: This option is obsolete now that mpv has OpenDML support.
 
 --loop=<number|inf|no>
     Loops playback <number> times. ``inf`` means forever and ``no`` disables
@@ -1162,7 +1162,7 @@
 
 --mixer-channel=<name[,index]>
     (``--ao=oss`` and ``--ao=alsa`` only)
-    This option will tell MPlayer to use a different channel for controlling
+    This option will tell mpv to use a different channel for controlling
     volume than the default PCM. Options for OSS include **vol, pcm, line**.
     For a complete list of options look for ``SOUND_DEVICE_NAMES`` in
     ``/usr/include/linux/soundcard.h``. For ALSA you can use the names e.g.
@@ -1189,7 +1189,7 @@
     also ``--monitoraspect`` and ``--aspect``.
 
 --mouse-movements
-    Permit MPlayer to receive pointer events reported by the video output
+    Permit mpv to receive pointer events reported by the video output
     driver. Necessary to select the buttons in DVD menus. Supported for
     X11-based VOs (x11, xv, etc) and the gl, direct3d and corevideo VOs.
 
@@ -1208,7 +1208,7 @@
 
     *NOTE*: Some messages are printed before the command line is parsed and
     are therefore not affected by ``--msglevel``. To control these messages
-    you have to use the ``MPLAYER_VERBOSE`` environment variable; see its
+    you have to use the ``MPV_VERBOSE`` environment variable; see its
     description below for details.
 
     Available levels:
@@ -1284,7 +1284,7 @@
 
 --ordered-chapters, --no-ordered-chapters
     Enabled by default.
-    Disable support for Matroska ordered chapters. MPlayer will not load or
+    Disable support for Matroska ordered chapters. mpv will not load or
     search for video segments from other files, and will also ignore any
     chapter order specified for the main file.
 
@@ -1342,9 +1342,9 @@
     Play files according to a playlist file (ASX, Winamp, SMIL, or
     one-file-per-line format).
 
-    *WARNING*: The way MPlayer parses and uses playlist files is not safe
+    *WARNING*: The way mpv parses and uses playlist files is not safe
     against maliciously constructed files. Such files may trigger harmful
-    actions. This has been the case for all MPlayer versions, but
+    actions. This has been the case for all mpv and MPlayer versions, but
     unfortunately this fact was not well documented earlier, and some people
     have even misguidedly recommended use of ``--playlist`` with untrusted
     sources. Do NOT use ``--playlist`` with random internet sources or files
@@ -1373,7 +1373,7 @@
 
 --priority=<prio>
     (Windows only.)
-    Set process priority for MPlayer according to the predefined priorities
+    Set process priority for mpv according to the predefined priorities
     available under Windows.
 
     Possible values of <prio>:
@@ -1402,7 +1402,7 @@
     the V4L2 driver. The Hauppauge WinTV PVR-150/250/350/500 and all IVTV
     based cards are known as PVR capture cards. Be aware that only Linux
     2.6.18 kernel and above is able to handle MPEG stream through V4L2 layer.
-    For hardware capture of an MPEG stream and watching it with MPlayer, use
+    For hardware capture of an MPEG stream and watching it with mpv, use
     ``pvr://`` as a movie URL.
 
     Available options are:
@@ -1460,10 +1460,10 @@
 
 --radio=<option1:option2:...>
     These options set various parameters of the radio capture module. For
-    listening to radio with MPlayer use ``radio://<frequency>`` (if channels
+    listening to radio with mpv use ``radio://<frequency>`` (if channels
     option is not given) or ``radio://<channel_number>`` (if channels option
     is given) as a movie URL. You can see allowed frequency range by running
-    MPlayer with ``-v``. To start the grabbing subsystem, use
+    mpv with ``-v``. To start the grabbing subsystem, use
     ``radio://<frequency or channel>/capture``. If the capture keyword is not
     given you can listen to radio using the line-in cable only. Using capture
     to listen is not recommended due to synchronization problems, which makes
@@ -1523,7 +1523,7 @@
 
     :channels=<value>:   number of channels
     :rate=<value>:       rate in samples per second
-    :format=<value>:     mplayer audio format (e.g. s16le)
+    :format=<value>:     mpv audio format (e.g. s16le)
 
 --rawvideo=<option1:option2:...>
     This option lets you play raw video files. You have to use
@@ -1543,10 +1543,10 @@
 
     *EXAMPLE*:
 
-    - ``mplayer foreman.qcif --demuxer=rawvideo --rawvideo=qcif`` Play the
+    - ``mpv foreman.qcif --demuxer=rawvideo --rawvideo=qcif`` Play the
       famous "foreman" sample video.
 
-    - ``mplayer sample-720x576.yuv --demuxer=rawvideo --rawvideo=w=720:h=576``
+    - ``mpv sample-720x576.yuv --demuxer=rawvideo --rawvideo=w=720:h=576``
       Play a raw YUV sample.
 
 --really-quiet
@@ -1568,7 +1568,7 @@
     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
     RTP packets to the right interface. If the connection to the RTSP server
-    fails, use ``-v`` to see which IP address MPlayer tries to bind to and try
+    fails, use ``-v`` to see which IP address mpv tries to bind to and try
     to force it to one assigned to your computer instead.
 
 --rtsp-port
@@ -1576,18 +1576,6 @@
     may be useful if you are behind a router and want to forward the RTSP
     stream from the server to a specific client.
 
---rtsp-stream-over-http
-    (LIVE555 only)
-    Used with ``http://`` URLs to specify that the resulting incoming RTP and
-    RTCP packets be streamed over HTTP.
-
---rtsp-stream-over-tcp
-    (LIVE555 and NEMESI only)
-    Used with ``rtsp://`` URLs to specify that the resulting incoming RTP and
-    RTCP packets be streamed over TCP (using the same TCP connection as RTSP).
-    This option may be useful if you have a broken internet connection that
-    does not pass incoming UDP packets (see http://www.live555.com/mplayer/).
-
 --saturation=<-100-100>
     Adjust the saturation of the video signal (default: 0). You can get
     grayscale output with this option. Not supported by all video output
@@ -1597,7 +1585,7 @@
     Force index rebuilding and dump the index to <filename>. Currently this
     only works with AVI files.
 
-    *NOTE*: This option is obsolete now that MPlayer has OpenDML support.
+    *NOTE*: This option is obsolete now that mpv has OpenDML support.
 
 --sb=<n>
     Seek to byte position. Useful for playback from CD-ROM images or VOB files
@@ -1647,7 +1635,7 @@
         passing the format ``%04n`` will yield ``0012`` on the 12th screenshot.
         The number is incremented every time a screenshot is taken, or if the
         file already exists. The length ``X`` must be in the range 0-9. With
-        the optional # sign mplayer will use the lowest available number. For
+        the optional # sign mpv will use the lowest available number. For
         example, if you take three screenshots--0001, 0002, 0003--and delete
         the first two, the next two screenshots won't be 0004 and 0005, but
         0001 and 0002 again.
@@ -1703,14 +1691,14 @@
     Specify a priority list of subtitle languages to use. Different container
     formats employ different language codes. DVDs use ISO 639-1 two letter
     language codes, Matroska uses ISO 639-2 three letter language codes while
-    OGM uses a free-form identifier. MPlayer prints the available languages
+    OGM uses a free-form identifier. mpv prints the available languages
     when run in verbose (``-v``) mode. See also ``--sid``.
 
     *EXAMPLE*:
 
-    - ``mplayer dvd://1 --slang=hu,en`` chooses the Hungarian subtitle track on
+    - ``mpv dvd://1 --slang=hu,en`` chooses the Hungarian subtitle track on
       a DVD and falls back on English if Hungarian is not available.
-    - ``mplayer --slang=jpn example.mkv`` plays a Matroska file with Japanese
+    - ``mpv --slang=jpn example.mkv`` plays a Matroska file with Japanese
       subtitles.
 
 --slave-broken
@@ -1721,7 +1709,7 @@
     particular, the status line output was changed, which is used by some
     applications to determine the current playback position. This switch has
     been renamed to prevent these applications from working with this version
-    of mplayer, because it would lead to buggy and confusing behavior only.
+    of mpv, because it would lead to buggy and confusing behavior only.
     Moreover, the slave mode protocol is so horribly bad that it should not be
     used for new programs, nor should existing programs attempt to adapt to the
     changed output and use the --slave-broken switch. Instead, a new, saner
@@ -1737,13 +1725,13 @@
 
 --softsleep
     Time frames by repeatedly checking the current time instead of asking
-    the kernel to wake up MPlayer at the correct time. Useful if your kernel
+    the kernel to wake up mpv at the correct time. Useful if your kernel
     timing is imprecise and you cannot use the RTC either. Comes at the
     price of higher CPU consumption.
 
 --softvol=<mode>
     Control whether to use the volume controls of the audio output driver, or
-    the internal mplayer volume filter.
+    the internal mpv volume filter.
 
     :no:    prefer audio driver controls, use the volume filter only if
             absolutely needed
@@ -1751,7 +1739,7 @@
     :auto:  prefer the volume filter if the audio driver uses the system mixer (default)
 
     The intention with ``auto`` is to avoid changing system mixer settings with
-    default settings. mplayer is a video player, not a mixer panel. On the other
+    default settings. mpv is a video player, not a mixer panel. On the other
     hand, mixer controls should be used for sound servers like PulseAudio, which
     provide per-application volume.
 
@@ -1818,7 +1806,7 @@
     *EXAMPLE*: ``--vf=scale=-ssf=lgb=3.0``
 
 --sstep=<sec>
-    Skip <sec> seconds after every frame. Since MPlayer will only seek to
+    Skip <sec> seconds after every frame. Since mpv will only seek to
     the next keyframe unless you use ``--hr-seek`` this may be inexact.
 
 --stereo=<mode>
@@ -1870,14 +1858,14 @@
     to video file directory.
 
     *EXAMPLE*: Assuming that ``/path/to/movie/movie.avi`` is played and
-    ``--sub-paths=sub:subtitles:/tmp/subs`` is specified, MPlayer searches for
+    ``--sub-paths=sub:subtitles:/tmp/subs`` is specified, mpv searches for
     subtitle files in these directories:
 
     - ``/path/to/movie/``
     - ``/path/to/movie/sub/``
     - ``/path/to/movie/subtitles/``
     - ``/tmp/subs/``
-    - ``~/.mplayer/sub/``
+    - ``~/.mpv/sub/``
 
 --subcp=<codepage>
     If your system supports ``iconv(3)``, you can use this option to specify
@@ -1894,7 +1882,7 @@
 
     You can specify your language using a two letter language code to make
     ENCA detect the codepage automatically. If unsure, enter anything and
-    watch mplayer ``-v`` output for available languages. Fallback codepage
+    watch mpv ``-v`` output for available languages. Fallback codepage
     specifies the codepage to use, when autodetection fails.
 
     *EXAMPLE*:
@@ -1996,7 +1984,7 @@
 
 --tv=<option1:option2:...>
     This option tunes various properties of the TV capture module. For
-    watching TV with MPlayer, use ``tv://`` or ``tv://<channel_number>`` or
+    watching TV with mpv, use ``tv://`` or ``tv://<channel_number>`` or
     even ``tv://<channel_name>`` (see option channels for channel_name below)
     as a movie URL. You can also use ``tv:///<input_id>`` to start watching a
     movie from a composite or S-Video input (see option input for details).
@@ -2136,7 +2124,7 @@
     mjpeg
         Use hardware MJPEG compression (if the card supports it). When using
         this option, you do not need to specify the width and height of the
-        output window, because MPlayer will determine it automatically from
+        output window, because mpv will determine it automatically from
         the decimation value (see below).
 
     decimation=<1|2|4>
@@ -2187,7 +2175,7 @@
         in size, resulting in choppy video when using immediatemode=0.
 
 --tvscan=<option1:option2:...>
-    Tune the TV channel scanner. MPlayer will also print value for "-tv
+    Tune the TV channel scanner. mpv will also print value for "-tv
     channels=" option, including existing and just found channels.
 
     Available suboptions are:
@@ -2206,7 +2194,7 @@
         indicate that the currently scanning channel is active.
 
 --unicode
-    Tells MPlayer to handle the subtitle file as unicode.
+    Tells mpv to handle the subtitle file as unicode.
 
 --use-filedir-conf
     Look for a file-specific configuration file in the same directory as the
@@ -2222,7 +2210,7 @@
     Use <string> as user agent for HTTP streaming.
 
 --utf8
-    Tells MPlayer to handle the subtitle file as UTF-8.
+    Tells mpv to handle the subtitle file as UTF-8.
 
 -v
     Increment verbosity level, one level for each ``-v`` found on the command
@@ -2232,7 +2220,7 @@
     Specify a priority list of video codecs to be used, according to their
     codec name in ``codecs.conf``. Use a '-' before the codec name to omit it.
     Use a '+' before the codec name to force it, this will likely crash! If
-    the list has a trailing ',' MPlayer will fall back on codecs not contained
+    the list has a trailing ',' mpv will fall back on codecs not contained
     in the list.
 
     *NOTE*: See ``--vc=help`` for a full list of available codecs.
@@ -2300,10 +2288,10 @@
 
 --wid=<ID>
     (X11, OpenGL and DirectX only)
-    This tells MPlayer to attach to an existing window. Useful to embed
-    MPlayer in a browser (e.g. the plugger extension). Earlier this option
+    This tells mpv to attach to an existing window. Useful to embed
+    mpv in a browser (e.g. the plugger extension). Earlier this option
     always filled the given window completely, thus aspect scaling, panscan,
-    etc were no longer handled by MPlayer but had to be managed by the
+    etc were no longer handled by mpv but had to be managed by the
     application that created the window. Now aspect is maintained by default.
     If you don't want that use ``--no-keepaspect``.
 
@@ -2313,7 +2301,7 @@
 
 --xineramascreen=<-2-...>
     In Xinerama configurations (i.e. a single desktop that spans across
-    multiple displays) this option tells MPlayer which screen to display the
+    multiple displays) this option tells mpv which screen to display the
     movie on. A value of -2 means fullscreen across the whole virtual display
     (in this case Xinerama information is completely ignored), -1 means
     fullscreen on the display the window currently is on. The initial position
@@ -2360,4 +2348,4 @@
 --zoom
     Allow software scaling, where available. This will allow scaling with
     output drivers (like x11) that do not support hardware scaling,
-    where MPlayer disables scaling by default for performance reasons.
+    where mpv disables scaling by default for performance reasons.
diff --git a/DOCS/man/en/vo.rst b/DOCS/man/en/vo.rst
index 265edec0b2..dd5b0f72ef 100644
--- a/DOCS/man/en/vo.rst
+++ b/DOCS/man/en/vo.rst
@@ -9,7 +9,7 @@ syntax is:
 --vo=<driver1[:suboption1[=value]:...],driver2,...[,]>
     Specify a priority list of video 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 ``--vo=help`` for a list of compiled-in video output drivers.
@@ -26,7 +26,7 @@ xv (X11 only)
     the most compatible VO on X, but may be low quality, and has issues with
     OSD and subtitle display.
     For information about what colorkey is used and how it is drawn run
-    MPlayer with ``-v`` option and look out for the lines tagged with ``[xv
+    mpv with ``-v`` option and look out for the lines tagged with ``[xv
     common]`` at the beginning.
 
     adaptor=<number>
@@ -39,7 +39,7 @@ xv (X11 only)
         cur
           The default takes the colorkey currently set in Xv.
         use
-          Use but do not set the colorkey from MPlayer (use the ``--colorkey``
+          Use but do not set the colorkey from mpv (use the ``--colorkey``
           option to change it).
         set
           Same as use but also sets the supplied colorkey.
@@ -128,8 +128,8 @@ vdpau (X11 only)
         3). See below for additional information.
 
     Using the VDPAU frame queueing functionality controlled by the queuetime
-    options makes MPlayer's frame flip timing less sensitive to system CPU
-    load and allows MPlayer to start decoding the next frame(s) slightly
+    options makes mpv's frame flip timing less sensitive to system CPU
+    load and allows mpv to start decoding the next frame(s) slightly
     earlier which can reduce jitter caused by individual slow-to-decode
     frames. However the NVIDIA graphics drivers can make other window behavior
     such as window moves choppy if VDPAU is using the blit queue (mainly
@@ -334,7 +334,7 @@ opengl
         Positive non-zero values select the target bit depth. Default: 0.
 
         \-1
-            Disable any dithering done by mplayer.
+            Disable any dithering done by mpv.
         0
             Automatic selection. If output bit depth can't be detected,
             8 bits per component are assumed.
diff --git a/DOCS/tech-overview.txt b/DOCS/tech-overview.txt
index 9acfe846cf..9ffe891c5c 100644
--- a/DOCS/tech-overview.txt
+++ b/DOCS/tech-overview.txt
@@ -1,6 +1,6 @@
 NOTE: DOCS/OUTDATED-tech/* may contain more detailed information, but most of it
       is possibly or definitely outdated. This file intends to give a big
-      picture of how mplayer is structured.
+      picture of how mplayer/mpv is structured.
 
 mplayer.c:
     This contains the main play loop, anything related to mplayer and playback
@@ -65,8 +65,8 @@ talloc.h & talloc.c:
     One very useful feature of talloc is fast tracking of memory leaks. ("Fast"
     as in it doesn't require valgrind.) You can enable it by passing the option
     --leak-report as first parameter, or better, setting the
-    MPLAYER_LEAK_REPORT environment variable to "1":
-        export MPLAYER_LEAK_REPORT=1
+    MPV_LEAK_REPORT environment variable to "1":
+        export MPV_LEAK_REPORT=1
     This will list all unfree'd allocations on exit.
 
     Documentation can be found here: