Release 0.4.2

command: append entries to the end of the playlist with loadlist append
Currently entries are added after the current playlist element. This is kinda confusing, more so given that "loadfile append" appends at the end of the playlist.
2014-07-26 12:12:40 +02:00 · 2014-07-26 11:55:02 +02:00 · 2014-07-24 21:15:55 +02:00 · 2014-07-23 12:39:38 +02:00 · 2014-07-20 21:56:46 +02:00 · 2014-07-18 10:31:58 +02:00
810 changed files with 81329 additions and 127006 deletions
@@ -1,26 +0,0 @@
-### mpv version and platform
-
-If you're not using git master or the latest release, update.
-Releases are listed here: https://github.com/mpv-player/mpv/releases
-
-### Reproduction steps
-
-### Expected behavior
-
-### Actual behavior
-
-### Log file
-
-Make a log file made with -v or --log-file=output.txt, paste it to
-http://sprunge.us or a similar site, and replace this text with a link to it.
-
-Providing a log file is strongly encouraged. It is very helpful for reproducing
-bugs or getting important technical context. Without a log it might not be
-possible to analyze and fix certain bugs, and your bug report will be closed
-or ignored.
-
-### Sample files
-
-Sample files needed to reproduce this issue can be uploaded to https://0x0.st/
-or similar sites. (Only needed if the issue cannot be reproduced without it.)
-Do not use garbage like "cloud storage", especially not Google Drive.
@@ -1,7 +0,0 @@
-Ideally, you shouldn't need enter any text here, and your commit messages should
-explain your changes sufficiently (especially why they are needed). Read
-https://github.com/mpv-player/mpv/blob/master/DOCS/contribute.md for coding
-style and development conventions. Remove this text block, but if you haven't
-agreed to it before, leave the following sentence in place:
-
-I agree that my changes can be relicensed to LGPL 2.1 or later.
@@ -14,22 +14,20 @@
 /input/input_conf.h
 /tags
 /TAGS
+/video/out/gl_video_shaders.h
 /video/out/x11_icon.inc
 /demux/ebml_defs.c
 /demux/ebml_types.h
 /sub/osd_font.h
 /player/lua/*.inc
-/player/builtin_conf.inc
-/DOCS/man/mpv.1
-/DOCS/man/mpv.aux
-/DOCS/man/mpv.log
-/DOCS/man/mpv.out
-/DOCS/man/mpv.pdf
-/DOCS/man/mpv.toc
+/DOCS/man/*/mpv.1
+/DOCS/man/*/mpv.aux
+/DOCS/man/*/mpv.log
+/DOCS/man/*/mpv.out
+/DOCS/man/*/mpv.pdf
+/DOCS/man/*/mpv.toc

 /waf
-/waf-*
-/waf3-*
 /build
 /.waf*
 /.lock-waf_*
@@ -1,60 +1,30 @@
 language: c

-os:
-  - linux
-  #- osx
 env:
-  matrix:
-    - LIBAV=ffmpeg-git
-    - LIBAV=libav-git
-  global:
-    # Coverity token
-    - secure: "H21mSRlMhk4BKS0xHZvCFGJxteCP0hRVUxTuNfM2Z9HBsyutuLEYMtViLO86VtM+Tqla3xXPzUdS4ozLwI72Ax/5ZUDXACROj73yW6QhFB5D6rLut12+FjqC7M33Qv2hl0xwgNBmR5dsm1ToP37+Wn+ecJQNvN8fkTXF+HVzOEw="
-    # Travis token for mpv.io
-    - secure: "nlTVLJK6kRhtXvhKCoJ3YdFGHuKaq/eHowfPw25hqRWuBOZd+HjHY5KIYjV7SxuKFDpJE4GpNcvA3Q31nsqomxpkLYgrwjg6TSazN7ZP+x85ZgV1QGFebrPfGm2n5UR5CAPAwFoeF3pZheLi4bajVzwq1fWW+x3grS188P9OZso="
+  - LIBAV=libav-stable
+  - LIBAV=libav-git
+  - LIBAV=ffmpeg-stable
+  - LIBAV=ffmpeg-git
 compiler:
  - clang
-  - gcc
-
 branches:
  only:
    - master
    - ci
-    - coverity_scan

-matrix:
-  exclude:
-    - os: osx
-      env: LIBAV=libav-git
-    - os: osx
-      env: LIBAV=ffmpeg-git
-    - os: osx
-      compiler: gcc
-    - os: linux
-      compiler: clang
-
-before_install: TOOLS/travis-deps libass-stable $LIBAV
+before_install: ./travis-deps libass-stable $LIBAV
 script:
  - ./bootstrap.py
  - ./waf configure
  - ./waf build
-after_failure: cat ./build/config.log
-after_script: TOOLS/travis-rebuild-website
+
+notifications-policy: &notifications-policy
+  on_success: change
+  on_failure: always

 notifications:
  email: false
  irc:
    channels:
-      - "irc.freenode.org#mpv-devel"
-    on_success: change
-    on_failure: always
-
-addons:
-  coverity_scan:
-    project:
-      name: "mpv-player/mpv"
-      description: "Build submitted via Travis CI"
-    notification_email: mpv-team@googlegroups.com
-    build_command_prepend: "./bootstrap.py && ./waf configure"
-    build_command:   "./waf build"
-    branch_pattern: coverity_scan
+      - "irc.freenode.org#mpv-player-dev"
+    <<: *notifications-policy
@@ -1,95 +1,19 @@
 mpv is a fork of mplayer2, which is a fork of MPlayer.

-mpv as a whole is licensed under the GNU General Public License GPL version 2
-or later (called GPLv2+ in this document, see LICENSE.GPL for full license
-text) by default, or the GNU Lesser General Public License LGPL version 2 or
-later (LGPLv2.1+ in this document, see LICENSE.LGPL for full license text) if
-built with the --enable-lgpl configure switch.
-
-Most source files are LGPLv2.1+ or GPLv2+, but some files are available under
-more liberal licenses, such as BSD, MIT, ISC, and possibly others. Look at the
-copyright header of each source file, and grep the sources for "Copyright" if
-you need to know details. C source files without Copyright notice are usually
-licensed as LGPLv2.1+. Also see the list of files with specific licenses below
-(not all files can have a standard license header).
-
-All new contributions must be LGPLv2.1+ licensed. Using a more liberal license
-compatible to LGPLv2.1+ is also ok.
-
-If changes are done on GPL code, must come with the implicit agreement that the
-project can relicense the changes to LGPLv2.1+ at a later point without asking
-the contributor. This is a safeguard for making potential relicensing of
-remaining GPL code to LGPLv2.1+ easier.
+mpv as a whole is licensed as GPL version 2 or later (see LICENSE). Most source
+files are GPLv2+, but some files are available under a more liberal license,
+such as LGPLv2+, BSD, MIT, ISC, and possibly others. Look at the copyright
+header of each source file, and grep the sources for "Copyright" if you need
+to know details. Files without Copyright notice are licensed as LGPLv2+.

 For information about authors and contributors, consult the git log, which
 contains the complete SVN and CVS history as well.

-"v2.1+" in this context means "version 2.1 or later".
+Note that mplayer2 as a whole is licensed under GPLv3+. This is because it uses
+a copy of talloc (part of Samba), which is LGPLv3+, and the next compatible
+license for this mix is GPLv3+.

-Some libraries are GPLv2+ or GPLv3+ only. Building mpv with Samba support makes
-it GPLv3+.
-
-mpv can be built as LGPLv2.1+ with the --enable-lgpl configure option. To add
-a LGPL mode to mpv, MPlayer code had to be relicensed from GPLv2+ to LGPLv2.1+
-by asking the MPlayer authors for permission. Since permission could not be
-obtained from everyone, LGPL mode disables the following features, some of
-them quite central:
- no audio filtering, which breaks: --af, pitch correction, fine control over
-  downmix/upmix/resampling behavior
- Linux X11 video output
- BSD audio output via OSS
- NVIDIA/Linux hardware decoding (vdpau, although nvdec usually works)
- Linux TV input
- minor features: jack, DVD, CDDA, SMB, CACA, legacy direct3d VO
-Some of these will be fixed in the future. The intended use for LGPL mode is
-with libmpv, and currently it's not recommended to build mpv CLI in LGPL mode
-at all.
-
-The following files are still GPL only (--enable-lgpl disables them):
-
-    audio/filter/*                  will be replaced with new filter chain
-    audio/filter/af_format.c        mostly LGPL (except af glue code)
-    audio/filter/af_lavc3enc.c          as above
-    audio/filter/af_lavfi.c             as above
-    audio/filter/af_scaletempo.c        as above
-    audio/filter/af_rubberband.c        as above
-    audio/out/ao_jack.c             will stay GPL
-    audio/out/ao_oss.c              will stay GPL
-    audio/audio.*                   needed by af code only
-    demux/demux_tv.c                will stay GPL
-    stream/ai_*                     will stay GPL (TV code)
-    stream/audio_in.*               will stay GPL (TV code)
-    stream/dvb*                     must stay GPL
-    stream/frequencies.*            must stay GPL
-    stream/stream_cdda.c            unknown
-    stream/stream_dvb.*             must stay GPL
-    stream/stream_dvd.c             unknown
-    stream/stream_dvd_common.*      unknown
-    stream/stream_dvdnav.c          unknown
-    stream/stream_smb.c             will stay GPLv3
-    stream/stream_tv.c              will stay GPL
-    stream/tv*                      will stay GPL
-    video/out/vo_caca.c             unknown
-    video/out/vo_direct3d.c         unknown
-    video/out/vo_vaapi.c            probably impossible (some company's code)
-    video/out/vo_vdpau.c            probably impossible (nVidia's code)
-    video/out/vo_x11.c              probably impossible
-    video/out/vo_xv.c               probably impossible
-    video/out/x11_common.*          probably impossible
-    video/vdpau.c                   hard (GPL-only parts must be ifdefed)
-    video/vdpau.h                   unknown
-    video/vdpau_mixer.*             actual code must be rewritten
-    DOCS/man/                       GPLv2+
-    bootstrap.py                    unknown license, probably GPLv2+ or LGPLv2+
-    etc/mplayer-input.conf          unknown license, probably GPLv2+
-    mpv.desktop                     unknown license, probably GPLv2+
-    etc/restore-old-bindings.conf   unknown license, probably GPLv2+
-
-The following files contain some optional GPL code (--enable-lgpl disables it):
-
-    options/parse_commandline.c     dvd:// expansion
-    player/audio.c                  libaf glue code
-
-None of the exceptions listed above affect the final binary if it's built as
-LGPL. Linked libraries still can affect the final license (for example if
-FFmpeg was built as GPL).
+MPlayer as a whole is licensed under GPLv2 (incompatible to GPLv3!), because
+some files are licensed to GPLv2 (and _not_ any later version of the license).
+In particular, this affects the file libmpdemux/demux_ty_osd.c. It is disabled
+under mplayer2, and has been removed from mpv.
@@ -1,174 +0,0 @@
-Introduction
-============
-
-This file lists all changes that can cause compatibility issues when using
-mpv through the client API (libmpv and ``client.h``). Since the client API
-interfaces to input handling (commands, properties) as well as command line
-options, you should also look at ``interface-changes.rst``.
-
-Normally, changes to the C API that are incompatible to previous iterations
-receive a major version bump (i.e. the first version number is increased),
-while C API additions bump the minor version (i.e. the second number is
-increased). Changes to properties/commands/options may also lead to a minor
-version bump, in particular if they are incompatible.
-
-The version number is the same as used for MPV_CLIENT_API_VERSION (see
-``client.h`` how to convert between major/minor version numbers and the flat
-32 bit integer).
-
-Also, read the section ``Compatibility`` in ``client.h``.
-
-Options, commands, properties
-=============================
-
-Changes to these are not listed here, but in ``interface-changes.rst``. (Before
-client API version 1.17, they were listed here partially.)
-
-This listing includes changes to the bare C API and behavior only, not what
-you can access with them.
-
-API changes
-===========
-
-::
-
- --- mpv 0.29.0 ---
- 1.26   - remove glMPGetNativeDisplay("drm") support
-        - add mpv_opengl_cb_window_pos and mpv_opengl_cb_drm_params and
-          support via glMPGetNativeDisplay() for using it
-        - make --stop-playback-on-init-failure=no the default in libmpv (just
-          like in mpv CLI)
- --- mpv 0.27.0 ---
- 1.25   - remove setting "no-" options via mpv_set_option*(). (See corresponding
-          deprecation in 0.23.0.)
- --- mpv 0.25.0 ---
- 1.24   - add a MPV_ENABLE_DEPRECATED preprocessor symbol, which can be defined
-          by the user to exclude deprecated API symbols from the C headers
- --- mpv 0.23.0 ---
- 1.24   - the deprecated mpv_suspend() and mpv_resume() APIs now do nothing.
- --- mpv 0.22.0 ---
- 1.23   - deprecate setting "no-" options via mpv_set_option*(). For example,
-          instead of "no-video=" you should set "video=no".
-        - do not override the SIGPIPE signal handler anymore. This was done as
-          workaround for the FFmpeg TLS code, which has been fixed long ago.
-        - deprecate mpv_suspend() and mpv_resume(). They will be stubbed out
-          in mpv 0.23.0.
-        - make mpv_set_property() work to some degree before mpv_initialize().
-          It can now be used instead of mpv_set_option().
-        - semi-deprecate mpv_set_option()/mpv_set_option_string(). You should
-          use mpv_set_property() instead. There are some deprecated properties
-          which conflict with some options (see client.h remarks on
-          mpv_set_option()), for which mpv_set_option() might still be required.
-          In future mpv releases, the conflicting deprecated options/properties
-          will be removed, and mpv_set_option() will internally translate API
-          calls to mpv_set_property().
-        - qthelper.hpp: deprecate get_property_variant, set_property_variant,
-          set_option_variant, command_variant, and replace them with
-          get_property, set_property, command.
- --- mpv 0.19.0 ---
- 1.22   - add stream_cb API for custom protocols
- --- mpv 0.18.1 ---
- ----   - remove "status" log level from mpv_request_log_messages() docs. This
-          is 100% equivalent to "v". The behavior is still the same, thus no
-          actual API change.
- --- mpv 0.18.0 ---
- 1.21   - mpv_set_property() changes behavior with MPV_FORMAT_NODE. Before this
-          change it rejected mpv_nodes with format==MPV_FORMAT_STRING if the
-          property was not a string or did not have special mechanisms in place
-          the function failed. Now it always invokes the option string parser,
-          and mpv_node with a basic data type works exactly as if the function
-          is invoked with that type directly. This new behavior is equivalent
-          to mpv_set_option().
-          This also affects the mp.set_property_native() Lua function.
-        - generally, setting choice options/properties with "yes"/"no" options
-          can now be set as MPV_FORMAT_FLAG
-        - reading a choice property as MPV_FORMAT_NODE will now return a
-          MPV_FORMAT_FLAG value if the choice is "yes" (true) or "no" (false)
-          This implicitly affects Lua and JSON IPC interfaces as well.
-        - big changes to vo-cmdline on vo_opengl and vo_opengl_hq (but not
-          vo_opengl_cb): options are now normally not reset, but applied on top
-          of the current options. The special undocumented value "-" still
-          works, but now resets all options to before any vo-cmdline command
-          has been called.
- --- mpv 0.12.0 ---
- 1.20   - deprecate "GL_MP_D3D_interfaces"/"glMPGetD3DInterface", and introduce
-          "GL_MP_MPGetNativeDisplay"/"glMPGetNativeDisplay" (this is a
-          backwards-compatible rename)
- --- mpv 0.11.0 ---
- --- mpv 0.10.0 ---
- 1.19   - add "GL_MP_D3D_interfaces" pseudo extension to make it possible to
-          use DXVA2 in OpenGL fullscreen mode in some situations
-        - mpv_request_log_messages() now accepts "terminal-default" as parameter
- 1.18   - add MPV_END_FILE_REASON_REDIRECT, and change behavior of
-          MPV_EVENT_END_FILE accordingly
-        - a bunch of interface-changes.rst changes
- 1.17   - mpv_initialize() now blocks SIGPIPE (details see client.h)
- --- mpv 0.9.0 ---
- 1.16   - add mpv_opengl_cb_report_flip()
-        - introduce mpv_opengl_cb_draw() and deprecate mpv_opengl_cb_render()
-        - add MPV_FORMAT_BYTE_ARRAY
- 1.15   - mpv_initialize() will now load config files. This requires setting
-          the "config" and "config-dir" options. In particular, it will load
-          mpv.conf.
-        - minor backwards-compatible change to the "seek" and "screenshot"
-          commands (new flag syntax, old additional args deprecated)
- --- mpv 0.8.0 ---
- 1.14   - add mpv_wait_async_requests()
-        - the --msg-level option changes its native type from a flat string to
-          a key-value list (setting/reading the option as string still works)
- 1.13   - add MPV_EVENT_QUEUE_OVERFLOW
- 1.12   - add class Handle to qthelper.hpp
-        - improve opengl_cb.h API uninitialization behavior, and fix the qml
-          example
-        - add mpv_create_client() function
- 1.11   - add OpenGL rendering interop API - allows an application to combine
-          its own and mpv's OpenGL rendering
-          Warning: this API is not stable yet - anything in opengl_cb.h might
-                   be changed in completely incompatible ways in minor API bumps
- --- mpv 0.7.0 ---
- 1.10   - deprecate/disable everything directly related to script_dispatch
-          (most likely affects nobody)
- 1.9    - add enum mpv_end_file_reason for mpv_event_end_file.reason
-        - add MPV_END_FILE_REASON_ERROR and the mpv_event_end_file.error field
-          for slightly better error reporting on playback failure
-        - add --stop-playback-on-init-failure option, and make it the default
-          behavior for libmpv only
-        - add qthelper.hpp set_option_variant()
-        - mark the following events as deprecated:
-            MPV_EVENT_TRACKS_CHANGED
-            MPV_EVENT_TRACK_SWITCHED
-            MPV_EVENT_PAUSE
-            MPV_EVENT_UNPAUSE
-            MPV_EVENT_METADATA_UPDATE
-            MPV_EVENT_CHAPTER_CHANGE
-          They are handled better with mpv_observe_property() as mentioned in
-          the documentation comments. They are not removed and still work.
- 1.8    - add qthelper.hpp
- 1.7    - add mpv_command_node(), mpv_command_node_async()
- 1.6    - modify "core-idle" property behavior
-        - MPV_EVENT_LOG_MESSAGE now always sends complete lines
-        - introduce numeric log levels (mpv_log_level)
- --- mpv 0.6.0 ---
- 1.5    - change in X11 and "--wid" behavior again. The previous change didn't
-          work as expected, and now the behavior can be explicitly controlled
-          with the "input-x11-keyboard" option. This is only a temporary
-          measure until XEmbed is implemented and confirmed working.
-          Note: in 1.6, "input-x11-keyboard" was renamed to "input-vo-keyboard",
-          although the old option name still works.
- 1.4    - subtle change in X11 and "--wid" behavior
-          (this change was added to 0.5.2, and broke some things, see #1090)
- --- mpv 0.5.0 ---
- 1.3    - add MPV_MAKE_VERSION()
- 1.2    - remove "stream-time-pos" property (no replacement)
- 1.1    - remap dvdnav:// to dvd://
-        - add "--cache-file", "--cache-file-size"
-        - add "--colormatrix-primaries" (and property)
-        - add "primaries" sub-field to image format properties
-        - add "playback-time" property
-        - extend the "--start" option; a leading "+", which was previously
-          insignificant is now significant
-        - add "cache-free" and "cache-used" properties
-        - OSX: the "coreaudio" AO spdif code is split into a separate AO
- --- mpv 0.4.0 ---
- 1.0    - the API is declared stable
-
@@ -0,0 +1,10 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+static inline void check_error(int status)
+{
+    if (status < 0) {
+        printf("mpv API error: %s\n", mpv_error_string(status));
+        exit(1);
+    }
+}
@@ -0,0 +1,44 @@
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "libmpv/client.h"
+#include "shared.h"
+
+int main(int argc, char *argv[])
+{
+    if (argc != 2) {
+        printf("pass a single media file as argument\n");
+        return 1;
+    }
+
+    mpv_handle *ctx = mpv_create();
+    if (!ctx) {
+        printf("failed creating context\n");
+        return 1;
+    }
+
+    // Enable default key bindings, so the user can actually interact with
+    // the player (and e.g. close the window).
+    check_error(mpv_set_option_string(ctx, "input-default-bindings", "yes"));
+    int val = 1;
+    check_error(mpv_set_option(ctx, "osc", MPV_FORMAT_FLAG, &val));
+
+    // Done setting up options.
+    check_error(mpv_initialize(ctx));
+
+    // Play this file.
+    const char *cmd[] = {"loadfile", argv[1], NULL};
+    check_error(mpv_command(ctx, cmd));
+
+    // Let it play, and wait until the user quits.
+    while (1) {
+        mpv_event *event = mpv_wait_event(ctx, 10000);
+        printf("event: %s\n", mpv_event_name(event->event_id));
+        if (event->event_id == MPV_EVENT_SHUTDOWN)
+            break;
+    }
+
+    mpv_terminate_destroy(ctx);
+    return 0;
+}
@@ -1,209 +0,0 @@
-Compiling for Windows
-=====================
-
-Compiling for Windows is supported with MinGW-w64. This can be used to produce
-both 32-bit and 64-bit executables, and it works for building on Windows and
-cross-compiling from Linux and Cygwin. MinGW-w64 is available from:
-http://mingw-w64.sourceforge.net.
-
-While building a complete MinGW-w64 toolchain yourself is possible, there are a
-few build environments and scripts to help ease the process, such as MSYS2 and
-MXE. Note that MinGW environments included in Linux distributions are often
-broken, outdated and useless, and usually don't use MinGW-w64.
-
-**Warning**: the original MinGW (http://www.mingw.org) is unsupported.
-
-Cross-compilation
-=================
-
-When cross-compiling, you have to run mpv's configure with these arguments:
-
-```bash
-DEST_OS=win32 TARGET=i686-w64-mingw32 ./waf configure
-```
-
-[MXE](http://mxe.cc) makes it very easy to bootstrap a complete MingGW-w64
-environment from a Linux machine. See a working example below.
-
-Alternatively, you can try [mingw-w64-cmake](https://github.com/lachs0r/mingw-w64-cmake),
-which bootstraps a MinGW-w64 environment and builds mpv and dependencies.
-
-Example with MXE
----------------
-
-```bash
-# Before starting, make sure you install MXE prerequisites. MXE will download
-# and build all target dependencies, but no host dependencies. For example,
-# you need a working compiler, or MXE can't build the crosscompiler.
-#
-# Refer to
-#
-#    http://mxe.cc/#requirements
-#
-# Scroll down for disto/OS-specific instructions to install them.
-
-# Download MXE. Note that compiling the required packages requires about 1.4 GB
-# or more!
-
-cd /opt
-git clone https://github.com/mxe/mxe mxe
-cd mxe
-
-# Set build options.
-
-# The JOBS environment variable controls threads to use when building. DO NOT
-# use the regular `make -j4` option with MXE as it will slow down the build.
-# Alternatively, you can set this in the make command by appending "JOBS=4"
-# to the end of command:
-echo "JOBS := 4" >> settings.mk
-
-# The MXE_TARGET environment variable builds MinGW-w64 for 32 bit targets.
-# Alternatively, you can specify this in the make command by appending
-# "MXE_TARGETS=i686-w64-mingw32" to the end of command:
-echo "MXE_TARGETS := i686-w64-mingw32.static" >> settings.mk
-
-# If you want to build 64 bit version, use this:
-# echo "MXE_TARGETS := x86_64-w64-mingw32.static" >> settings.mk
-
-# Build required packages. The following provide a minimum required to build
-# a reasonable mpv binary (though not an absolute minimum).
-
-make gcc ffmpeg libass jpeg lua
-
-# Add MXE binaries to $PATH
-export PATH=/opt/mxe/usr/bin/:$PATH
-
-# Build mpv. The target will be used to automatically select the name of the
-# build tools involved (e.g. it will use i686-w64-mingw32.static-gcc).
-
-cd ..
-git clone https://github.com/mpv-player/mpv.git
-cd mpv
-python ./bootstrap.py
-DEST_OS=win32 TARGET=i686-w64-mingw32.static ./waf configure
-# Or, if 64 bit version,
-# DEST_OS=win32 TARGET=x86_64-w64-mingw32.static ./waf configure
-./waf build
-```
-
-Native compilation with MSYS2
-=============================
-
-For Windows developers looking to get started quickly, MSYS2 can be used to
-compile mpv natively on a Windows machine. The MSYS2 repositories have binary
-packages for most of mpv's dependencies, so the process should only involve
-building mpv itself.
-
-To build 64-bit mpv on Windows:
-
-Installing MSYS2
----------------
-
-1. Download an installer from https://msys2.github.io/
-
-   Both the i686 and the x86_64 version of MSYS2 can build 32-bit and 64-bit
-   mpv binaries when running on a 64-bit version of Windows, but the x86_64
-   version is preferred since the larger address space makes it less prone to
-   fork() errors.
-
-2. Start a MinGW-w64 shell (``mingw64.exe``). **Note:** This is different from
-   the MSYS2 shell that is started from the final installation dialog. You must
-   close that shell and open a new one.
-
-   For a 32-bit build, use ``mingw32.exe``.
-
-Updating MSYS2
--------------
-
-To prevent errors during post-install, the MSYS2 core runtime must be updated
-separately.
-
-```bash
-# Check for core updates. If instructed, close the shell window and reopen it
-# before continuing.
-pacman -Syu
-
-# Update everything else
-pacman -Su
-```
-
-Installing mpv dependencies
---------------------------
-
-```bash
-# Install MSYS2 build dependencies and a MinGW-w64 compiler
-pacman -S git python $MINGW_PACKAGE_PREFIX-{pkg-config,gcc}
-
-# Install the most important MinGW-w64 dependencies. libass and lcms2 are also
-# pulled in as dependencies of ffmpeg.
-pacman -S $MINGW_PACKAGE_PREFIX-{ffmpeg,libjpeg-turbo,lua51,angleproject-git}
-```
-
-Building mpv
------------
-
-Clone the latest mpv from git and install waf. **Note:** ``/usr/bin/python3``
-is invoked directly here, since an MSYS2 version of Python is required.
-
-```bash
-git clone https://github.com/mpv-player/mpv.git && cd mpv
-/usr/bin/python3 bootstrap.py
-```
-
-Finally, compile and install mpv. Binaries will be installed to
-``/mingw64/bin`` or ``/mingw32/bin``.
-
-```bash
-/usr/bin/python3 waf configure CC=gcc.exe --check-c-compiler=gcc --prefix=$MSYSTEM_PREFIX
-/usr/bin/python3 waf install
-```
-
-Or, compile and install both libmpv and mpv:
-
-```bash
-/usr/bin/python3 waf configure CC=gcc.exe --check-c-compiler=gcc --enable-libmpv-shared --prefix=$MSYSTEM_PREFIX
-/usr/bin/python3 waf install
-```
-
-Linking libmpv with MSVC programs
---------------------------------
-
-You can build C++ programs in Visual Studio and link them with libmpv. To do
-this, you need a Visual Studio which supports ``stdint.h`` (recent ones do),
-and you need to create a import library for the mpv DLL:
-
-```bash
-lib /def:mpv.def /name:mpv-1.dll /out:mpv.lib /MACHINE:X64
-```
-
-The string in the ``/name:`` parameter must match the filename of the DLL (this
-is simply the filename the MSVC linker will use). The ``mpv.def`` can be
-retrieved from the mpv build directory, or can be produced by MingGW's
-gendef.exe helper from the mpv DLL.
-
-Static linking is not possible.
-
-Running mpv
-----------
-
-If you want to run mpv from the MinGW-w64 shell, you will find the experience
-much more pleasant if you use the ``winpty`` utility
-
-```bash
-pacman -S winpty
-winpty mpv.com ToS-4k-1920.mov
-```
-
-If you want to move / copy ``mpv.exe`` and ``mpv.com`` to somewhere other than
-``/mingw64/bin/`` for use outside the MinGW-w64 shell, they will still depend on
-DLLs in that folder. The simplest solution is to add ``C:\msys64\mingw64\bin``
-to the windows system ``%PATH%``. Beware though that this can cause problems or
-confusion in Cygwin if that is also installed on the machine.
-
-Use of the ANGLE OpenGL backend requires a copy of the D3D compiler DLL that
-matches the version of the D3D SDK that ANGLE was built with
-(``d3dcompiler_43.dll`` in case of MinGW-built ANGLE) in the path or in the
-same folder as mpv. It must be of the same architecture (x86_64 / i686) as the
-mpv you compiled. You can find copies here:
-
-https://mpv.srsfckn.biz/d3dcompiler.7z
@@ -4,8 +4,8 @@ How to contribute
 General
 -------

-The main contact for mpv development is IRC, specifically #mpv
-and #mpv-devel on Freenode.
+The main contact for mpv development is IRC, specifically #mpv-player and
+#mpv-player-dev on Freenode.

 Sending patches
 ---------------
@@ -14,32 +14,18 @@ Sending patches
  ``git format-patch``. diffs posted as pastebins (especially if the http link
  returns HTML) just cause extra work for everyone, because they lack commit
  message and authorship information.
- All new code must be LGPLv2.1+ licensed, or come with the implicit agreement
-  that it will be relicensed to LGPLv2.1+ later (see ``Copyright`` in the
-  repository root directory).
- You must be either the exclusive author of the patch, or acknowledge all
-  authors involved in the commit message. If you take 3rd party code, authorship
-  and copyright must be properly acknowledged. If the license of the code is not
-  LGPLv2.1+, this must be mentioned.
- Don't use fake names (something that looks like an actual names, and may be
-  someone else's name, but is not your legal name). Using a pseudonyms is
-  allowed if it can be used to identify or contact you, even if whatever
-  account you used to submit the patch dies.
- When creating pull requests, be sure to test your changes. If you didn't,
-  please say so in the pull request message.
 - Write informative commit messages. Use present tense to describe the
  situation with the patch applied, and past tense for the situation before
  the change.
 - The subject line (the first line in a commit message) should contain a
  prefix identifying the sub system, followed by a short description what
-  impact this commit has. This subject line and the commit message body
-  shouldn't be longer than 72 characters per line, because it messes up the
-  output of many git tools otherwise.
+  impact this commit has. This subject line shouldn't be longer than 72
+  characters, because it messes up the output of many git tools otherwise.

  For example, you fixed a crash in af_volume.c:

-  - Bad: ``fixed the bug (wtf?)``
-  - Good: ``af_volume: fix crash due to null pointer access``
+  Bad: ``fixed the bug (wtf?)``
+  Good: ``af_volume: fix crash due to null pointer access``

  Having a prefix gives context, and is especially useful when trying to find
  a specific change by looking at the history, or when running ``git blame``.
@@ -63,14 +49,8 @@ Sending patches
  additional cosmetic changes in the same file you're working on. But don't do
  something like reformatting a whole file, and hiding an actual functional
  change in the same commit.
- Changes to command line options (addition/modification/removal) must be
-  documented in options.rst. Changes to input properties or input commands must
-  be documented in input.rst. All changes to the user interface (options,
-  properties, commands) must be documented with a small note in
-  interface-changes.rst (although documenting additions is optional, and
-  obscure corner cases can potentially be skipped too). Changes to the libmpv
-  API must be reflected in the libmpv's headers doxygen, and should be
-  documented in client-api-changes.rst.
+- If you add a new command line option, document it in options.rst. If you
+  add a new input property, document it in input.rst.

 Code formatting
 ---------------
@@ -113,16 +93,18 @@ mpv uses C99 with K&R formatting, with some exceptions.
            do_something();
    }
    ```
- If the if has an else branch, both branches should use braces, even if they're
-  technically redundant.
+- If the body of an if statement uses braces, the else branch should also
+  use braces (and reverse).

  Example:

    ```C
    if (a) {
-        one_line();
+        // do something
+        something();
+        something_else();
    } else {
-        one_other_line();
+        one_line();
    }
    ```
 - If an if condition spans multiple physical lines, then put the opening brace
@@ -136,13 +118,14 @@ mpv uses C99 with K&R formatting, with some exceptions.
        very_long_condition_b)
    {
        code();
-    } else {
-        ...
    }
    ```
-
-  (If the if body is simple enough, this rule can be skipped.)
 - Remove any trailing whitespace.
+- If the file you're editing uses formatting different from from what is
+  described here, it's probably an old file from times when nobody followed a
+  consistent style. You're free to use the existing style, or the new style, or
+  to send a patch to reformat the file to the new style before making functional
+  changes.

 General coding
 --------------
@@ -158,35 +141,7 @@ General coding
 - Prefer fusing declaration and initialization, rather than putting declarations
  on the top of a block. Obvious data flow is more important than avoiding
  mixing declarations and statements, which is just a C90 artifact.
+- tech-overview.txt might help to get an overview how mpv is structured.
 - If you add features that require intrusive changes, discuss them on the dev
  channel first. There might be a better way to add a feature and it can avoid
  wasted work.
-
-Rules for git push access
-------------------------
-
-Push access to the main git repository is handed out on an arbitrary basis. If
-you got access, the following rules must be followed:
-
- You are expected to follow the general development rules as outlined in this
-  whole document.
- You must be present on the IRC dev channel when you push something.
- Anyone can push small fixes: typo corrections, small/obvious/uncontroversial
-  bug fixes, edits to the user documentation or code comments, and so on.
- You can freely make changes to parts of the code which you maintain. For
-  larger changes, it's recommended to let others review the changes first.
- You automatically maintain code if you wrote or modified most of it before
-  (e.g. you made larger changes to it before, did partial or full rewrites, did
-  major bug fixes, or you're the original author of the code). If there is more
-  than one maintainer, you may need to come to an agreement with the others how
-  to handle this to avoid conflict.
- As a maintainer, you can approve pushes by others to "your" code.
- If you approve or merge 3rd party changes, make sure they follow the general
-  development rules.
- Changes to user interface and public API must always be approved by the
-  project leader.
- Seasoned project members are allowed to revert commits that broke the build,
-  or broke basic functionality in a catastrophic way, and the developer who
-  broke it is unavailable. (Depending on severity.)
- Adhere to the CoC.
- The project leader is not bound by these rules.
@@ -0,0 +1,74 @@
+Cross Compiling to Windows
+==========================
+
+Cross compiling mpv to Windows is supported with MinGW-w64. This can be used to
+produce both 32 bit and 64 bit executables. MinGW-w64 is available from
+http://mingw-w64.sourceforge.net.
+
+You have to run mpv's configure with these arguments:
+
+```bash
+DEST_OS=win32 TARGET=i686-w64-mingw32 ./waf configure
+```
+
+While building a complete MinGW-w64 toolchain yourself is possible, people have
+created scripts to help ease the process. These are the two recommended methods:
+
+- Using [mingw-w64-cmake](https://github.com/lachs0r/mingw-w64-cmake) to setup
+  a MinGW-w64 environment. We recommend you to try this first before MXE.
+  mingw-w64-cmake will also build mpv and its dependencies.
+- Alternatively, you can use MXE: http://mxe.cc. With MXE, you have to manually
+  set the target to MinGW-w64 (even if you compile to 32 bit). A working example
+  below.
+
+**Warning**: the original MinGW (http://www.mingw.org) is unsupported.
+
+Note that MinGW environments included in Linux distributions are often broken,
+outdated and useless, and usually don't use MinGW-w64.
+
+Example with MXE
+----------------
+
+```bash
+# Download MXE. Note that compiling the required packages requires about 1.4 GB
+# or more!
+
+cd /opt
+git clone https://github.com/mxe/mxe mingw
+cd mingw
+
+# Set build options.
+
+# The JOBS environment variable controls threads to use when building. DO NOT
+# use the regular `make -j4` option with MXE as it will slow down the build.
+# Alternatively, you can set this in the make command by appending "JOBS=4"
+# to the end of command:
+echo "JOBS := 4" >> settings.mk
+
+# The MXE_TARGET environment variable builds MinGW-w64 for 32 bit targets.
+# Alternatively, you can specify this in the make command by appending
+# "MXE_TARGETS=i686-w64-mingw32" to the end of command:
+echo "MXE_TARGETS := i686-w64-mingw32" >> settings.mk
+
+# If you want to build 64 bit version, use this:
+# echo "MXE_TARGETS := x86_64-w64-mingw32" >> settings.mk
+
+# Build required packages. The following provide a minimum required to build
+# mpv.
+
+make gcc ffmpeg libass jpeg pthreads
+
+# Add MXE binaries to $PATH
+export PATH=/opt/mingw/usr/bin/:$PATH
+
+# Build mpv. The target will be used to automatically select the name of the
+# build tools involved (e.g. it will use i686-w64-mingw32-gcc).
+
+cd ..
+git clone https://github.com/mpv-player/mpv.git
+cd mpv
+DEST_OS=win32 TARGET=i686-w64-mingw32 ./waf configure
+# Or, if 64 bit version,
+# DEST_OS=win32 TARGET=x86_64-w64-mingw32 ./waf configure
+./waf build
+```
@@ -27,12 +27,13 @@ The general simplified syntax is::
    <filename>,<start in seconds>,<length in seconds>

 If the start time is omitted, 0 is used. If the length is omitted, the
-estimated remaining duration of the source file is used.
+estimated duration of the source file is used.

 Note::

-    Usage of relative or absolute paths as well as any protocol prefixes may be
-    prevented for security reasons.
+    mpv can't use ordered chapter files or libquvi-resolved URLs in EDL
+    entries. Usage of relative or absolute paths as well as any protocol
+    prefixes is prevented for security reasons.


 Syntax of mpv EDL files
@@ -51,8 +52,7 @@ The rest of the lines belong to one of these classes:
 1) An empty or commented line. A comment starts with ``#``, which must be the
   first character in the line. The rest of the line (up until the next line
   break) is ignored. An empty line has 0 bytes between two line feed bytes.
-2) A header entry if the line starts with ``!``.
-3) A segment entry in all other cases.
+2) A segment entry in all other cases.

 Each segment entry consists of a list of named or unnamed parameters.
 Parameters are separated with ``,``. Named parameters consist of a name,
@@ -64,8 +64,8 @@ Syntax::
    segment_entry ::= <param> ( <param> ',' )*
    param         ::= [ <name> '=' ] ( <value> | '%' <number> '%' <valuebytes> )

-The ``name`` string can consist of any characters, except ``=%,;\n!``. The
-``value`` string can consist of any characters except of ``,;\n!``.
+The ``name`` string can consist of any characters, except ``=%,;\n``. The
+``value`` string can consist of any characters except of ``,;\n``.

 The construct starting with ``%`` allows defining any value with arbitrary
 contents inline, where ``number`` is an integer giving the number of bytes in
@@ -95,42 +95,6 @@ to ``20``, ``param3`` to ``value,escaped``, ``param4`` to ``value2``.
 Instead of line breaks, the character ``;`` can be used. Line feed bytes and
 ``;`` are treated equally.

-Header entries start with ``!`` as first character after a line break. Header
-entries affect all other file entries in the EDL file. Their format is highly
-implementation specific. They should generally follow the file header, and come
-before any file entries.
-
-MP4 DASH
-========
-
-This is a header that helps implementing DASH, although it only provides a low
-level mechanism.
-
-If this header is set, the given url designates an mp4 init fragment. It's
-downloaded, and every URL in the EDL is prefixed with the init fragment on the
-byte stream level. This is mostly for use by mpv's internal ytdl support. The
-ytdl script will call youtube-dl, which in turn actually processes DASH
-manifests. It may work only for this very specific purpose and fail to be
-useful in other scenarios. It can be removed or changed in incompatible ways
-at any times.
-
-Example::
-
-    !mp4_dash,init=url
-
-The ``url`` is encoded as parameter value as defined in the general EDL syntax.
-It's expected to point to an "initialization fragment", which will be prefixed
-to every entry in the EDL on the byte stream level.
-
-The current implementation will
-
- ignore stream start times
- use durations as hint for seeking only
- not adjust source timestamps
- open and close segments (i.e. fragments) as needed
- not add segment boundaries as chapter points
- require full compatibility between all segments (same codec etc.)
-
 Timestamp format
 ================

@@ -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 .config/mpv/mpv.conf
+Of course, the options can be stored in a profile, like this .mpv/config
 section::

  [myencprofile]
@@ -95,16 +95,12 @@ As the options for various devices can get complex, profiles can be used.

 An example profile file for encoding is provided in
 etc/encoding-profiles.conf in the source tree. This file is installed and loaded
-by default. If you want to modify it, you can replace and it with your own copy
-by doing::
+by default (if libavfilter is enabled at compilation). If you want to modify
+it, you can replace and it with your own copy by doing::

  mkdir -p ~/.mpv
  cp /etc/mpv/encoding-profiles.conf ~/.mpv/encoding-profiles.conf

-Keep in mind that the default profile is the playback one. If you want to add
-options that apply only in encoding mode, put them into a ``[encoding]``
-section.
-
 Refer to the top of that file for more comments - in a nutshell, the following
 options are added by it::

@@ -1,478 +0,0 @@
-Introduction
-============
-
-mpv provides access to its internals via the following means:
-
- options
- commands
- properties
- events
-
-All of these are important for interfacing both with end users and API users
-(which include Lua scripts, libmpv, and the JSON IPC). As such, they constitute
-a large part of the user interface and APIs.
-
-This document lists changes to them. New changes are added to the top.
-
-Interface changes
-=================
-
-::
-
- --- mpv 0.28.0 ---
-    - rename --hwdec=mediacodec option to mediacodec-copy, to reflect
-      conventions followed by other hardware video decoding APIs
-    - drop previously deprecated --heartbeat-cmd and --heartbeat--interval
-      options
-    - rename --vo=opengl to --vo=gpu
-    - rename --opengl-backend to --gpu-context
-    - rename --opengl-shaders to --glsl-shaders
-    - rename --opengl-shader-cache-dir to --gpu-shader-cache-dir
-    - rename --opengl-tex-pad-x/y to --gpu-tex-pad-x/y
-    - rename --opengl-fbo-format to --fbo-format
-    - rename --opengl-gamma to --gamma-factor
-    - rename --opengl-debug to --gpu-debug
-    - rename --opengl-sw to --gpu-sw
-    - rename --opengl-vsync-fences to --swapchain-depth, and the interpretation
-      slightly changed. Now defaults to 3.
-    - rename the built-in profile `opengl-hq` to `gpu-hq`
-    - the semantics of --opengl-es=yes are slightly changed -> now requires GLES
-    - remove the (deprecated) alias --gpu-context=drm-egl
-    - remove the (deprecated) --vo=opengl-hq
-    - remove --opengl-es=force2 (use --opengl-es=yes --opengl-restrict=300)
-    - the --msg-level option now affects --log-file
-    - drop "audio-out-detected-device" property - this was unavailable on all
-      audio output drivers for quite a while (coreaudio used to provide it)
-    - deprecate --videotoolbox-format (use --hwdec-image-format, which affects
-      most other hwaccels)
-    - remove deprecated --demuxer-max-packets
-    - remove most of the deprecated audio and video filters
-    - remove the deprecated --balance option/property
-    - rename the --opengl-hwdec-interop option to --gpu-hwdec-interop, and
-      change some of its semantics: extend it take the strings "auto" and
-      "all". "all" loads all backends. "auto" behaves like "all" for
-      vo_opengl_cb, while on vo_gpu it loads nothing, but allows on demand
-      loading by the decoder. The empty string as option value behaves like
-      "auto". Old --hwdec values do not work anymore.
-      This option is hereby declared as unstable and may change any time - its
-      old use is deprecated, and it has very little use outside of debugging
-      now.
-    - change the --hwdec option from a choice to a plain string (affects
-      introspection of the option/property), also affects some properties
-    - rename --hwdec=rpi to --hwdec=mmal, sane for the -copy variant (no
-      backwards compatibility)
-    - deprecate the --ff-aid, --ff-vid, -ff-sid options and properties (there is
-      no replacement, but you can manually query the track property and use the
-      "ff-index" field to find the mpv track ID to imitate this behavior)
- --- mpv 0.27.0 ---
-    - drop previously deprecated --field-dominance option
-    - drop previously deprecated "osd" command
-    - remove client API compatibility handling for "script", "sub-file",
-      "audio-file", "external-file" (these cases used to log a deprecation
-      warning)
-    - drop deprecated --video-aspect-method=hybrid option choice
-    - rename --hdr-tone-mapping to --tone-mapping (and generalize it)
-    - --opengl-fbo-format changes from a choice to a string. Also, its value
-      will be checked only on renderer initialization, rather than when the
-      option is set.
-    - Using opengl-cb now always assumes 8 bit per component depth, and dithers
-      to this size. Before, it tried to figure out the depth of the first
-      framebuffer that was ever passed to the renderer. Having GL framebuffers
-      with a size larger than 8 bit per component is quite rare. If you need
-      it, set the --dither-depth option instead.
-    - --lavfi-complex can now be set during runtime. If you set this in
-      expectation it would be applied only after a reload, you might observe
-      weird behavior.
-    - add --track-auto-selection to help with scripts/applications that
-      make exclusive use of --lavfi-complex.
-    - undeprecate --loop, and map it from --loop-playlist to --loop-file (the
-      deprecation was to make sure no API user gets broken by a sudden behavior
-      change)
-    - remove previously deprecated vf_eq
-    - remove that hardware deinterlace filters (vavpp, d3d11vpp, vdpaupp)
-      changed their deinterlacing-enabled setting depending on what the
-      --deinterlace option or property was set to. Now, a filter always does
-      what its filter options and defaults imply. The --deinterlace option and
-      property strictly add/remove its own filters. For example, if you run
-      "mpv --vf=vavpp --deinterlace=yes", this will insert another, redundant
-      filter, which is probably not what you want. For toggling a deinterlace
-      filter manually, use the "vf toggle" command, and do not set the
-      deinterlace option/property. To customize the filter that will be
-      inserted automatically, use --vf-defaults. Details how this works will
-      probably change in the future.
-    - remove deinterlace=auto (this was not deprecated, but had only a very
-      obscure use that stopped working with the change above. It was also
-      prone to be confused with a feature not implemented by it: auto did _not_
-      mean that deinterlacing was enabled on demand.)
-    - add shortened mnemonic names for mouse button bindings, eg. mbtn_left
-      the old numeric names (mouse_btn0) are deprecated
-    - remove mouse_btn3_dbl and up, since they are only generated for buttons
-      0-2 (these now print an error when sent from the 'mouse' command)
-    - rename the axis bindings to wheel_up/down/etc. axis scrolling and mouse
-      wheel scrolling are now conceptually the same thing
-      the old axis_up/down names remain as deprecated aliases
- --- mpv 0.26.0 ---
-    - remove remaining deprecated audio device options, like --alsa-device
-      Some of them were removed in earlier releases.
-    - introduce --replaygain... options, which replace the same functionality
-      provided by the deprecated --af=volume:replaygain... mechanism.
-    - drop the internal "mp-rawvideo" codec (used by --demuxer=rawvideo)
-    - rename --sub-ass-style-override to --sub-ass-override, and rename the
-      `--sub-ass-override=signfs` setting to `--sub-ass-override=scale`.
-    - change default of --video-aspect-method to "bitstream". The "hybrid"
-      method (old default) is deprecated.
-    - remove property "video-params/nom-peak"
-    - remove option --target-brightness
-    - replace vf_format's `peak` suboption by `sig-peak`, which is relative to
-      the reference white level instead of in cd/m^2
-    - renamed the TRCs `st2084` and `std-b67` to `pq` and `hlg` respectively
-    - the "osd" command is deprecated (use "cycle osd-level")
-    - --field-dominance is deprecated (use --vf=setfield=bff or tff)
-    - --really-quiet subtle behavior change
-    - the deprecated handling of setting "no-" options via client API is dropped
-    - the following options change to append-by-default (and possibly separator):
-        --script
-      also, the following options are deprecated:
-        --sub-paths => --sub-file-paths
-      the following options are deprecated for setting via API:
-        "script" (use "scripts")
-        "sub-file" (use "sub-files")
-        "audio-file" (use "audio-files")
-        "external-file" (use "external-files")
-        (the compatibility hacks for this will be removed after this release)
-    - remove property `vo-performance`, and add `vo-passes` as a more general
-      replacement
-    - deprecate passing multiple arguments to -add/-pre options (affects the
-      vf/af commands too)
-    - remove --demuxer-lavf-cryptokey. Use --demux-lavf-o=cryptokey=<hex> or
-      --demux-lavf-o=decryption_key=<hex> instead (whatever fits your situation).
-    - rename --opengl-dumb-mode=no to --opengl-dumb-mode=auto, and make `no`
-      always disable it (unless forced on by hardware limitation).
-    - generalize --scale-clamp, --cscale-clamp etc. to accept a float between
-      0.0 and 1.0 instead of just being a flag. A value of 1.0 corresponds to
-      the old `yes`, and a value of 0.0 corresponds to the old `no`.
- --- mpv 0.25.0 ---
-    - remove opengl-cb dxva2 dummy hwdec interop
-      (see git "vo_opengl: remove dxva2 dummy hwdec backend")
-    - remove ppm, pgm, pgmyuv, tga choices from the --screenshot-format and
-      --vo-image-format options
-    - the "jpeg" choice in the option above now leads to a ".jpg" file extension
-    - --af=drc is gone (you can use e.g. lavfi/acompressor instead)
-    - remove image_size predefined uniform from OpenGL user shaders. Use
-      input_size instead
-    - add --sub-filter-sdh
-    - add --sub-filter-sdh-harder
-    - remove --input-app-events option (macOS)
-    - deprecate most --vf and --af filters. Only some filters not in libavfilter
-      will be kept.
-      Also, you can use libavfilter filters directly (e.g. you can use
-      --vf=name=opts instead of --vf=lavfi=[name=opts]), as long as the
-      libavfilter filter's name doesn't clash with a mpv builtin filter.
-      In the long term, --vf/--af syntax might change again, but if it does, it
-      will switch to libavfilter's native syntax. (The above mentioned direct
-      support for lavfi filters still has some differences, such as how strings
-      are escaped.) If this happens, the non-deprecated builtin filters might be
-      moved to "somewhere else" syntax-wise.
-    - deprecate --loop - after a deprecation period, it will be undeprecated,
-      but changed to alias --loop-file
-    - add --keep-open-pause=no
-    - deprecate --demuxer-max-packets
-    - change --audio-file-auto default from "exact" to "no" (mpv won't load
-      files with the same filename as the video, but different extension, as
-      audio track anymore)
- --- mpv 0.24.0 ---
-    - deprecate --hwdec-api and replace it with --opengl-hwdec-interop.
-      The new option accepts both --hwdec values, as well as named backends.
-      A minor difference is that --hwdec-api=no (which used to be the default)
-      now actually does not preload any interop layer, while the new default
-      ("") uses the value of --hwdec.
-    - drop deprecated --ad/--vd features
-    - drop deprecated --sub-codepage syntax
-    - rename properties:
-        - "drop-frame-count" to "decoder-frame-drop-count"
-        - "vo-drop-frame-count" to "frame-drop-count"
-      The old names still work, but are deprecated.
-    - remove the --stream-capture option and property. No replacement.
-      (--record-file might serve as alternative)
-    - add --sub-justify
-    - add --sub-ass-justify
-    - internally there's a different way to enable the demuxer cache now
-      it can be auto-enabled even if the stream cache remains disabled
- --- mpv 0.23.0 ---
-    - remove deprecated vf_vdpaurb (use "--hwdec=vdpau-copy" instead)
-    - the following properties now have new semantics:
-        - "demuxer" (use "current-demuxer")
-        - "fps" (use "container-fps")
-        - "idle" (use "idle-active")
-        - "cache" (use "cache-percent")
-        - "audio-samplerate" (use "audio-params/samplerate")
-        - "audio-channels" (use "audio-params/channel-count")
-        - "audio-format" (use "audio-codec-name")
-      (the properties equivalent to the old semantics are in parentheses)
-    - remove deprecated --vo and --ao sub-options (like --vo=opengl:...), and
-      replace them with global options. A somewhat complete list can be found
-      here: https://github.com/mpv-player/mpv/wiki/Option-replacement-list#mpv-0210
-    - remove --vo-defaults and --ao-defaults as well
-    - remove deprecated global sub-options (like -demuxer-rawaudio format=...),
-      use flat options (like --demuxer-rawaudio-format=...)
-    - the --sub-codepage option changes in incompatible ways:
-        - detector-selection and fallback syntax is deprecated
-        - enca/libguess are removed and deprecated (behaves as if they hadn't
-          been compiled-in)
-        - --sub-codepage=<codepage> does not force the codepage anymore
-          (this requires different and new syntax)
-    - remove --fs-black-out-screens option for macOS
-    - change how spdif codecs are selected. You can't enable spdif passthrough
-      with --ad anymore. This was deprecated; use --audio-spdif instead.
-    - deprecate the "family" selection with --ad/--vd
-      forcing/excluding codecs with "+", "-", "-" is deprecated as well
-    - explicitly mark --ad-spdif-dtshd as deprecated (it was done so a long time
-      ago, but it didn't complain when using the option)
- --- mpv 0.22.0 ---
-    - the "audio-device-list" property now sets empty device description to the
-      device name as a fallback
-    - add --hidpi-window-scale option for macOS
-    - add audiounit audio output for iOS
-    - make --start-time work with --rebase-start-time=no
-    - add --opengl-early-flush=auto mode
-    - add --hwdec=vdpau-copy, deprecate vf_vdpaurb
-    - add tct video output for true-color and 256-color terminals
- --- mpv 0.21.0 ---
-    - unlike in older versions, setting options at runtime will now take effect
-      immediately (see for example issue #3281). On the other hand, it will also
-      do runtime verification and reject option changes that do not work
-      (example: setting the "vf" option to a filter during playback, which fails
-      to initialize - the option value will remain at its old value). In general,
-      "set name value" should be mostly equivalent to "set options/name value"
-      in cases where the "name" property is not deprecated and "options/name"
-      exists - deviations from this are either bugs, or documented as caveats
-      in the "Inconsistencies between options and properties" manpage section.
-    - deprecate _all_ --vo and --ao suboptions. Generally, all suboptions are
-      replaced by global options, which do exactly the same. For example,
-      "--vo=opengl:scale=nearest" turns into "--scale=nearest". In some cases,
-      the global option is prefixed, e.g. "--vo=opengl:pbo" turns into
-      "--opengl-pbo".
-      Most of the exact replacements are documented here:
-        https://github.com/mpv-player/mpv/wiki/Option-replacement-list
-    - remove --vo=opengl-hq. Set --profile=opengl-hq instead. Note that this
-      profile does not force the VO. This means if you use the --vo option to
-      set another VO, it won't work. But this also means it can be used with
-      opengl-cb.
-    - remove the --vo=opengl "pre-shaders", "post-shaders" and "scale-shader"
-      sub-options: they were deprecated in favor of "user-shaders"
-    - deprecate --vo-defaults (no replacement)
-    - remove the vo-cmdline command. You can set OpenGL renderer options
-      directly via properties instead.
-    - deprecate the device/sink options on all AOs. Use --audio-device instead.
-    - deprecate "--ao=wasapi:exclusive" and "--ao=coreaudio:exclusive",
-      use --audio-exclusive instead.
-    - subtle changes in how "--no-..." options are treated mean that they are
-      not accessible under "options/..." anymore (instead, these are resolved
-      at parsing time). This does not affect options which start with "--no-",
-      but do not use the mechanism for negation options.
-      (Also see client API change for API version 1.23.)
-    - rename the following properties
-        - "demuxer" -> "current-demuxer"
-        - "fps" -> "container-fps"
-        - "idle" -> "idle-active"
-        - "cache" -> "cache-percent"
-      the old names are deprecated and will change behavior in mpv 0.23.0.
-    - remove deprecated "hwdec-active" and "hwdec-detected" properties
-    - deprecate the ao and vo auto-profiles (they never made any sense)
-    - deprecate "--vo=direct3d_shaders" - use "--vo=direct3d" instead.
-      Change "--vo=direct3d" to always use shaders by default.
-    - deprecate --playlist-pos option, renamed to --playlist-start
-    - deprecate the --chapter option, as it is redundant with --start/--end,
-      and conflicts with the semantics of the "chapter" property
-    - rename --sub-text-* to --sub-* and --ass-* to --sub-ass-* (old options
-      deprecated)
-    - incompatible change to cdda:// protocol options: the part after cdda://
-      now always sets the device, not the span or speed to be played. No
-      separating extra "/" is needed. The hidden --cdda-device options is also
-      deleted (it was redundant with the documented --cdrom-device).
-    - deprecate --vo=rpi. It will be removed in mpv 0.23.0. Its functionality
-      was folded into --vo=opengl, which now uses RPI hardware decoding by
-      treating it as a hardware overlay (without applying GL filtering). Also
-      to be changed in 0.23.0: the --fs flag will be reset to "no" by default
-      (like on the other platforms).
-    - deprecate --mute=auto (informally has been since 0.18.1)
-    - deprecate "resume" and "suspend" IPC commands. They will be completely
-      removed in 0.23.0.
-    - deprecate mp.suspend(), mp.resume(), mp.resume_all() Lua scripting
-      commands, as well as setting mp.use_suspend. They will be completely
-      removed in 0.23.0.
-    - the "seek" command's absolute seek mode will now interpret negative
-      seek times as relative from the end of the file (and clamps seeks that
-      still go before 0)
-    - add almost all options to the property list, meaning you can change
-      options without adding "options/" to the property name (a new section
-      has been added to the manpage describing some conflicting behavior
-      between options and properties)
-    - implement changing sub-speed during playback
-    - make many previously fixed options changeable at runtime (for example
-      --terminal, --osc, --ytdl, can all be enable/disabled after
-      mpv_initialize() - this can be extended to other still fixed options
-      on user requests)
- --- mpv 0.20.0 ---
-    - add --image-display-duration option - this also means that image duration
-      is not influenced by --mf-fps anymore in the general case (this is an
-      incompatible change)
- --- mpv 0.19.0 ---
-    - deprecate "balance" option/property (no replacement)
- --- mpv 0.18.1 ---
-    - deprecate --heartbeat-cmd
-    - remove --softvol=no capability:
-        - deprecate --softvol, it now does nothing
-        - --volume, --mute, and the corresponding properties now always control
-          softvol, and behave as expected without surprises (e.g. you can set
-          them normally while no audio is initialized)
-        - rename --softvol-max to --volume-max (deprecated alias is added)
-        - the --volume-restore-data option and property are removed without
-          replacement. They were _always_ internal, and used for watch-later
-          resume/restore. Now --volume/--mute are saved directly instead.
-        - the previous point means resuming files with older watch-later configs
-          will print an error about missing --volume-restore-data (which you can
-          ignore), and will not restore the previous value
-        - as a consequence, volume controls will no longer control PulseAudio
-          per-application value, or use the system mixer's per-application
-          volume processing
-        - system or per-application volume can still be controlled with the
-          ao-volume and ao-mute properties (there are no command line options)
- --- mpv 0.18.0 ---
-    - now ab-loops are active even if one of the "ab-loop-a"/"-b" properties is
-      unset ("no"), in which case the start of the file is used if the A loop
-      point is unset, and the end of the file for an unset B loop point
-    - deprecate --sub-ass=no option by --ass-style-override=strip
-      (also needs --embeddedfonts=no)
-    - add "hwdec-interop" and "hwdec-current" properties
-    - deprecated "hwdec-active" and "hwdec-detected" properties (to be removed
-      in mpv 0.20.0)
-    - choice option/property values that are "yes" or "no" will now be returned
-      as booleans when using the mpv_node functions in the client API, the
-      "native" property accessors in Lua, and the JSON API. They can be set as
-      such as well.
-    - the VO opengl fbo-format sub-option does not accept "rgb" or "rgba"
-      anymore
-    - all VO opengl prescalers have been removed (replaced by user scripts)
- --- mpv 0.17.0 ---
-    - deprecate "track-list/N/audio-channels" property (use
-      "track-list/N/demux-channel-count" instead)
-    - remove write access to "stream-pos", and change semantics for read access
-    - Lua scripts now don't suspend mpv by default while script code is run
-    - add "cache-speed" property
-    - rename --input-unix-socket to --input-ipc-server, and make it work on
-      Windows too
-    - change the exact behavior of the "video-zoom" property
-    - --video-unscaled no longer disables --video-zoom and --video-aspect
-      To force the old behavior, set --video-zoom=0 and --video-aspect=0
- --- mpv 0.16.0 ---
-    - change --audio-channels default to stereo (use --audio-channels=auto to
-      get the old default)
-    - add --audio-normalize-downmix
-    - change the default downmix behavior (--audio-normalize-downmix=yes to get
-      the old default)
-    - VO opengl custom shaders must now use "sample_pixel" as function name,
-      instead of "sample"
-    - change VO opengl scaler-resizes-only default to enabled
-    - add VO opengl "interpolation-threshold" suboption (introduces new default
-      behavior, which can change e.g. ``--video-sync=display-vdrop`` to the
-      worse, but is usually what you want)
-    - make "volume" and "mute" properties changeable even if no audio output is
-      active (this gives not-ideal behavior if --softvol=no is used)
-    - add "volume-max" and "mixer-active" properties
-    - ignore --input-cursor option for events injected by input commands like
-      "mouse", "keydown", etc.
- --- mpv 0.15.0 ---
-    - change "yadif" video filter defaults
- --- mpv 0.14.0 ---
-    - vo_opengl interpolation now requires --video-sync=display-... to be set
-    - change some vo_opengl defaults (including changing tscale)
-    - add "vsync-ratio", "estimated-display-fps" properties
-    - add --rebase-start-time option
-      This is a breaking change to start time handling. Instead of making start
-      time handling an aspect of different options and properties (like
-      "time-pos" vs. "playback-time"), make it dependent on the new option. For
-      compatibility, the "time-start" property now always returns 0, so code
-      which attempted to handle rebasing manually will not break.
- --- mpv 0.13.0 ---
-    - remove VO opengl-cb frame queue suboptions (no replacement)
- --- mpv 0.12.0 ---
-    - remove --use-text-osd (useless; fontconfig isn't a requirement anymore,
-      and text rendering is also lazily initialized)
-    - some time properties (at least "playback-time", "time-pos",
-      "time-remaining", "playtime-remaining") now are unavailable if the time
-      is unknown, instead of just assuming that the internal playback position
-      is 0
-    - add --audio-fallback-to-null option
-    - replace vf_format outputlevels suboption with "video-output-levels" global
-      property/option; also remove "colormatrix-output-range" property
-    - vo_opengl: remove sharpen3/sharpen5 scale filters, add sharpen sub-option
- --- mpv 0.11.0 ---
-    - add "af-metadata" property
- --- mpv 0.10.0 ---
-    - add --video-aspect-method option
-    - add --playlist-pos option
-    - add --video-sync* options
-      "display-sync-active" property
-      "vo-missed-frame-count" property
-      "audio-speed-correction" and "video-speed-correction" properties
-    - remove --demuxer-readahead-packets and --demuxer-readahead-bytes
-      add --demuxer-max-packets and --demuxer-max-bytes
-      (the new options are not replacement and have very different semantics)
-    - change "video-aspect" property: always settable, even if no video is
-      running; always return the override - if no override is set, return
-      the video's aspect ratio
-    - remove disc-nav (DVD, BD) related properties and commands
-    - add "option-info/<name>/set-locally" property
-    - add --cache-backbuffer; change --cache-default default to 75MB
-      the new total cache size is the sum of backbuffer and the cache size
-      specified by --cache-default or --cache
-    - add ``track-list/N/audio-channels`` property
-    - change --screenshot-tag-colorspace default value
-    - add --stretch-image-subs-to-screen
-    - add "playlist/N/title" property
-    - add --video-stereo-mode=no to disable auto-conversions
-    - add --force-seekable, and change default seekability in some cases
-    - add vf yadif/vavpp/vdpaupp interlaced-only suboptions
-      Also, the option is enabled by default (Except vf_yadif, which has
-      it enabled only if it's inserted by the deinterlace property.)
-    - add --hwdec-preload
-    - add ao coreaudio exclusive suboption
-    - add ``track-list/N/forced`` property
-    - add audio-params/channel-count and ``audio-params-out/channel-count props.
-    - add af volume replaygain-fallback suboption
-    - add video-params/stereo-in property
-    - add "keypress", "keydown", and "keyup" commands
-    - deprecate --ad-spdif-dtshd and enabling passthrough via --ad
-      add --audio-spdif as replacement
-    - remove "get_property" command
-    - remove --slave-broken
-    - add vo opengl custom shader suboptions (source-shader, scale-shader,
-      pre-shaders, post-shaders)
-    - completely change how the hwdec properties work:
-        - "hwdec" now reflects the --hwdec option
-        - "hwdec-detected" does partially what the old "hwdec" property did
-          (and also, "detected-hwdec" is removed)
-        - "hwdec-active" is added
-    - add protocol-list property
-    - deprecate audio-samplerate and audio-channels properties
-      (audio-params sub-properties are the replacement)
-    - add audio-params and audio-out-params properties
-    - deprecate "audio-format" property, replaced with "audio-codec-name"
-    - deprecate --media-title, replaced with --force-media-title
-    - deprecate "length" property, replaced with "duration"
-    - change volume property:
-        - the value 100 is now always "unchanged volume" - with softvol, the
-          range is 0 to --softvol-max, without it is 0-100
-        - the minimum value of --softvol-max is raised to 100
-    - remove vo opengl npot suboption
-    - add relative seeking by percentage to "seek" command
-    - add playlist_shuffle command
-    - add --force-window=immediate
-    - add ao coreaudio change-physical-format suboption
-    - remove vo opengl icc-cache suboption, add icc-cache-dir suboption
-    - add --screenshot-directory
-    - add --screenshot-high-bit-depth
-    - add --screenshot-jpeg-source-chroma
-    - default action for "rescan_external_files" command changes
- --- mpv 0.9.0 ---
@@ -1,7 +1,5 @@
-- Rebuild the terminal status line as a lua script
+-- Rebuild the status line as a lua script
 -- Be aware that this will require more cpu power!
-- Also, this is based on a rather old version of the
-- builtin mpv status line.

 -- Add a string to the status line
 function atsl(s)
@@ -18,10 +16,10 @@ function update_status_line()
        atsl("(Buffering) ")
    end

-    if mp.get_property("aid") ~= "no" then
+    if mp.get_property("vid") ~= "no" then
        atsl("A")
    end
-    if mp.get_property("vid") ~= "no" then
+    if mp.get_property("aid") ~= "no" then
        atsl("V")
    end

@@ -30,7 +28,7 @@ function update_status_line()
    atsl(mp.get_property_osd("time-pos"))

    atsl(" / ");
-    atsl(mp.get_property_osd("duration"));
+    atsl(mp.get_property_osd("length"));

    atsl(" (")
    atsl(mp.get_property_osd("percent-pos", -1))
@@ -43,7 +41,7 @@ function update_status_line()

    r = mp.get_property_number("avsync", nil)
    if r ~= nil then
-        atsl(string.format(" A-V: %f", r))
+        atsl(string.format(" A-V: %7.3f", r))
    end

    r = mp.get_property("total-avsync-change", 0)
@@ -51,24 +49,12 @@ function update_status_line()
        atsl(string.format(" ct:%7.3f", r))
    end

-    r = mp.get_property_number("decoder-drop-frame-count", -1)
+    r = mp.get_property_number("drop-frame-count", -1)
    if r > 0 then
        atsl(" Late: ")
        atsl(r)
    end

-    r = mp.get_property_osd("video-bitrate")
-    if r ~= nil and r ~= "" then
-        atsl(" Vb: ")
-        atsl(r)
-    end
-
-    r = mp.get_property_osd("audio-bitrate")
-    if r ~= nil and r ~= "" then
-        atsl(" Ab: ")
-        atsl(r)
-    end
-
    r = mp.get_property_number("cache", 0)
    if r > 0 then
        atsl(string.format(" Cache: %d%% ", r))
@@ -78,15 +64,6 @@ function update_status_line()
    mp.set_property("options/term-status-msg", newStatus)
 end

-timer = mp.add_periodic_timer(1, update_status_line)
+-- Register the event
+mp.register_event("tick", update_status_line)

-function on_pause_change(name, value)
-    if value == false then
-        timer:resume()
-    else
-        timer:stop()
-    end
-    mp.add_timeout(0.1, update_status_line)
-end
-mp.observe_property("pause", "bool", on_pause_change)
-mp.register_event("seek", update_status_line)
@@ -4,22 +4,34 @@ AUDIO FILTERS
 Audio filters allow you to modify the audio stream and its properties. The
 syntax is:

-``--af=...``
-    Setup a chain of audio filters. See ``--vf`` for the syntax.
+``--af=<filter1[=parameter1:parameter2:...],filter2,...>``
+    Setup a chain of audio filters.

 .. note::

    To get a full list of available audio filters, see ``--af=help``.

-    Also, keep in mind that most actual filters are available via the ``lavfi``
-    wrapper, which gives you access to most of libavfilter's filters. This
-    includes all filters that have been ported from MPlayer to libavfilter.
+You can also set defaults for each filter. The defaults are applied before the
+normal filter parameters.

-    The ``--vf`` description describes how libavfilter can be used and how to
-    workaround deprecated mpv filters.
+``--af-defaults=<filter1[=parameter1:parameter2:...],filter2,...>``
+    Set defaults for each filter.

-See ``--vf`` group of options for info on how ``--af-defaults``, ``--af-add``,
-``--af-pre``, ``--af-del``, ``--af-clr``, and possibly others work.
+Audio filters are managed in lists. There are a few commands to manage the
+filter list:
+
+``--af-add=<filter1[,filter2,...]>``
+    Appends the filters given as arguments to the filter list.
+
+``--af-pre=<filter1[,filter2,...]>``
+    Prepends the filters given as arguments to the filter list.
+
+``--af-del=<index1[,index2,...]>``
+    Deletes the filters at the given indexes. Index numbers start at 0,
+    negative numbers address the end of the list (-1 is the last).
+
+``--af-clr``
+    Completely empties the filter list.

 Available filters are:

@@ -47,14 +59,11 @@ Available filters are:
        (If you just want to set defaults for this filter that will be used
        even by automatically inserted lavrresample instances, you should
        prefer setting them with ``--af-defaults=lavrresample:...``.)
-    ``normalize=<yes|no|auto>``
-        Whether to normalize when remixing channel layouts (default: auto).
-        ``auto`` uses the value set by ``--audio-normalize-downmix``.
    ``o=<string>``
        Set AVOptions on the SwrContext or AVAudioResampleContext. These should
        be documented by FFmpeg or Libav.

-``lavcac3enc[=options]``
+``lavcac3enc[=tospdif[:bitrate[:minchn]]]``
    Encode multi-channel audio to AC-3 at runtime using libavcodec. Supports
    16-bit native-endian input format, maximum 6 channels. The output is
    big-endian when outputting a raw AC-3 stream, native-endian when
@@ -63,17 +72,15 @@ Available filters are:

    ``tospdif=<yes|no>``
        Output raw AC-3 stream if ``no``, output to S/PDIF for
-        pass-through if ``yes`` (default).
+        passthrough if ``yes`` (default).

    ``bitrate=<rate>``
        The bitrate use for the AC-3 stream. Set it to 384 to get 384 kbps.

-        The default is 640. Some receivers might not be able to handle this.
-
        Valid values: 32, 40, 48, 56, 64, 80, 96, 112, 128,
        160, 192, 224, 256, 320, 384, 448, 512, 576, 640.

-        The special value ``auto`` selects a default bitrate based on the
+        The special value ``default`` selects a default bitrate based on the
        input channel number:

        :1ch: 96
@@ -83,30 +90,147 @@ Available filters are:
        :5ch: 448
        :6ch: 448

-    ``minch=<n>``
-        If the input channel number is less than ``<minch>``, the filter will
-        detach itself (default: 3).
+    ``minchn=<n>``
+        If the input channel number is less than ``<minchn>``, the filter will
+        detach itself (default: 5).

-    ``encoder=<name>``
-        Select the libavcodec encoder used. Currently, this should be an AC-3
-        encoder, and using another codec will fail horribly.
+``sweep[=speed]``
+    Produces a sine sweep.
+
+    ``<0.0-1.0>``
+        Sine function delta, use very low values to hear the sweep.
+
+``sinesuppress[=freq:decay]``
+    Remove a sine at the specified frequency. Useful to get rid of the 50/60Hz
+    noise on low quality audio equipment. It only works on mono input.
+
+    ``<freq>``
+        The frequency of the sine which should be removed (in Hz) (default:
+        50)
+    ``<decay>``
+        Controls the adaptivity (a larger value will make the filter adapt to
+        amplitude and phase changes quicker, a smaller value will make the
+        adaptation slower) (default: 0.0001). Reasonable values are around
+        0.001.
+
+``bs2b[=option1:option2:...]``
+    Bauer stereophonic to binaural transformation using libbs2b. Improves the
+    headphone listening experience by making the sound similar to that from
+    loudspeakers, allowing each ear to hear both channels and taking into
+    account the distance difference and the head shadowing effect. It is
+    applicable only to 2-channel audio.
+
+    ``fcut=<300-1000>``
+        Set cut frequency in Hz.
+    ``feed=<10-150>``
+        Set feed level for low frequencies in 0.1*dB.
+    ``profile=<value>``
+        Several profiles are available for convenience:
+
+        :default: will be used if nothing else was specified (fcut=700,
+                  feed=45)
+        :cmoy:    Chu Moy circuit implementation (fcut=700, feed=60)
+        :jmeier:  Jan Meier circuit implementation (fcut=650, feed=95)
+
+    If ``fcut`` or ``feed`` options are specified together with a profile, they
+    will be applied on top of the selected profile.
+
+``hrtf[=flag]``
+    Head-related transfer function: Converts multichannel audio to 2-channel
+    output for headphones, preserving the spatiality of the sound.
+
+    ==== ===================================
+    Flag Meaning
+    ==== ===================================
+    m    matrix decoding of the rear channel
+    s    2-channel matrix decoding
+    0    no matrix decoding (default)
+    ==== ===================================
+
+``equalizer=g1:g2:g3:...:g10``
+    10 octave band graphic equalizer, implemented using 10 IIR band-pass
+    filters. This means that it works regardless of what type of audio is
+    being played back. The center frequencies for the 10 bands are:
+
+    === ==========
+    No. frequency
+    === ==========
+    0    31.25  Hz
+    1    62.50  Hz
+    2   125.00  Hz
+    3   250.00  Hz
+    4   500.00  Hz
+    5     1.00 kHz
+    6     2.00 kHz
+    7     4.00 kHz
+    8     8.00 kHz
+    9    16.00 kHz
+    === ==========
+
+    If the sample rate of the sound being played is lower than the center
+    frequency for a frequency band, then that band will be disabled. A known
+    bug with this filter is that the characteristics for the uppermost band
+    are not completely symmetric if the sample rate is close to the center
+    frequency of that band. This problem can be worked around by upsampling
+    the sound using a resampling filter before it reaches this filter.
+
+    ``<g1>:<g2>:<g3>:...:<g10>``
+        floating point numbers representing the gain in dB for each frequency
+        band (-12-12)
+
+    .. admonition:: Example
+
+        ``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.
+
+``channels=nch[:routes]``
+    Can be used for adding, removing, routing and copying audio channels. If
+    only ``<nch>`` is given, the default routing is used. It works as follows:
+    If the number of output channels is greater than the number of input
+    channels, empty channels are inserted (except when mixing from mono to
+    stereo; then the mono channel is duplicated). If the number of output
+    channels is less than the number of input channels, the exceeding
+    channels are truncated.
+
+    ``<nch>``
+        number of output channels (1-8)
+    ``<routes>``
+        List of ``,`` separated routes, in the form ``from1-to1,from2-to2,...``.
+        Each pair defines where to route each channel. There can be at most
+        8 routes. Without this argument, the default routing is used. Since
+        ``,`` is also used to separate filters, you must quote this argument
+        with ``[...]`` or similar.
+
+    .. admonition:: Examples
+
+        ``mpv --af=channels=4:[0-1,1-0,0-2,1-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 were played back,
+            channels 2 and 3 would contain silence but 0 and 1 would still be
+            swapped.
+
+        ``mpv --af=channels=6:[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.
+
+    .. note::
+
+        You should probably not use this filter. If you want to change the
+        output channel layout, try the ``format`` filter, which can make mpv
+        automatically up- and downmix standard channel layouts.

 ``format=format:srate:channels:out-format:out-srate:out-channels``
-    Does not do any format conversion itself. Rather, it may cause the
-    filter system to insert necessary conversion filters before or after this
-    filter if needed. It is primarily useful for controlling the audio format
-    going into other filters. To specify the format for audio output, see
-    ``--audio-format``, ``--audio-samplerate``, and ``--audio-channels``. This
-    filter is able to force a particular format, whereas ``--audio-*``
-    may be overridden by the ao based on output compatibility.
+    Force a specific audio format/configuration without actually changing the
+    audio data. Keep in mind that the filter system might auto-insert actual
+    conversion filters before or after this filter if needed.

    All parameters are optional. The first 3 parameters restrict what the filter
-    accepts as input. They will therefore cause conversion filters to be
-    inserted before this one.  The ``out-`` parameters tell the filters or audio
-    outputs following this filter how to interpret the data without actually
-    doing a conversion. Setting these will probably just break things unless you
-    really know you want this for some reason, such as testing or dealing with
-    broken media.
+    accepts as input. The ``out-`` parameters change the audio format, without
+    actually doing a conversion. The data will be 'reinterpreted' by the
+    filters or audio outputs following this filter.

    ``<format>``
        Force conversion to this format. Use ``--af=format=format=help`` to get
@@ -126,9 +250,287 @@ Available filters are:

    ``<out-channels>``

-    *NOTE*: this filter used to be named ``force``. The old ``format`` filter
-    used to do conversion itself, unlike this one which lets the filter system
-    handle the conversion.
+    See also ``--audio-format``, ``--audio-samplerate``, and
+    ``--audio-channels`` for related options. Keep in mind that
+    ``--audio-channels`` does not actually force the number of
+    channels in most cases, while this filter can do this.
+
+    *NOTE*: this filter used to be named ``force``. Also, unlike the old
+    ``format`` filter, this does not do any actual conversion anymore.
+    Conversion is done by other, automatically inserted filters.
+
+``convert24``
+    Filter for internal use only. Converts between 24-bit and 32-bit sample
+    formats.
+
+``convertsignendian``
+    Filter for internal use only. Converts between signed/unsigned formats
+    and formats with different endian.
+
+``volume[=<volumedb>[:...]]``
+    Implements software volume control. Use this filter with caution since it
+    can reduce the signal to noise ratio of the sound. In most cases it is
+    best to use the *Master* volume control of your sound card or the volume
+    knob on your amplifier.
+
+    *NOTE*: This filter is not reentrant and can therefore only be enabled
+    once for every audio stream.
+
+    ``<volumedb>``
+        Sets the desired gain in dB for all channels in the stream from -200dB
+        to +60dB, where -200dB mutes the sound completely and +60dB equals a
+        gain of 1000 (default: 0).
+    ``replaygain-track``
+        Adjust volume gain according to the track-gain replaygain value stored
+        in the file metadata.
+    ``replaygain-album``
+        Like replaygain-track, but using the album-gain value instead.
+    ``replaygain-preamp``
+        Pre-amplification gain in dB to apply to the selected replaygain gain
+        (default: 0).
+    ``replaygain-clip=yes|no``
+        Prevent clipping caused by replaygain by automatically lowering the
+        gain (default). Use ``replaygain-clip=no`` to disable this.
+    ``softclip``
+        Turns soft clipping on. Soft-clipping can make the
+        sound more smooth if very high volume levels are used. Enable this
+        option if the dynamic range of the loudspeakers is very low.
+
+        *WARNING*: This feature creates distortion and should be considered a
+        last resort.
+    ``s16``
+        Force S16 sample format if set. Lower quality, but might be faster
+        in some situations.
+    ``detach``
+        Remove the filter if the volume is not changed at audio filter config
+        time. Useful with replaygain: if the current file has no replaygain
+        tags, then the filter will be removed if this option is enabled.
+        (If ``--softvol=yes`` is used and the player volume controls are used
+        during playback, a different volume filter will be inserted.)
+
+    .. admonition:: Example
+
+        ``mpv --af=volume=10.1 media.avi``
+            Would amplify the sound by 10.1dB and hard-clip if the sound level
+            is too high.
+
+``pan=n:[<matrix>]``
+    Mixes channels arbitrarily. Basically a combination of the volume and the
+    channels filter that can be used to down-mix many channels to only a few,
+    e.g. stereo to mono, or vary the "width" of the center speaker in a
+    surround sound system. This filter is hard to use, and will require some
+    tinkering before the desired result is obtained. The number of options for
+    this filter depends on the number of output channels. An example how to
+    downmix a six-channel file to two channels with this filter can be found
+    in the examples section near the end.
+
+    ``<n>``
+        Number of output channels (1-8).
+    ``<matrix>``
+        A list of values ``[L00,L01,L02,...,L10,L11,L12,...,Ln0,Ln1,Ln2,...]``,
+        where each element ``Lij`` means how much of input channel i is mixed
+        into output channel j (range 0-1). So in principle you first have n
+        numbers saying what to do with the first input channel, then n numbers
+        that act on the second input channel etc. If you do not specify any
+        numbers for some input channels, 0 is assumed.
+        Note that the values are separated by ``,``, which is already used
+        by the option parser to separate filters. This is why you must quote
+        the value list with ``[...]`` or similar.
+
+    .. admonition:: Examples
+
+        ``mpv --af=pan=1:[0.5,0.5] media.avi``
+            Would downmix from stereo to mono.
+
+        ``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).
+
+    .. note::
+
+        If you just want to force remixing to a certain output channel layout,
+        it is easier to use the ``format`` filter. For example,
+        ``mpv '--af=format=channels=5.1' '--audio-channels=5.1'`` would always force
+        remixing audio to 5.1 and output it like this.
+
+``sub[=fc:ch]``
+    Adds a subwoofer channel to the audio stream. The audio data used for
+    creating the subwoofer channel is an average of the sound in channel 0 and
+    channel 1. The resulting sound is then low-pass filtered by a 4th order
+    Butterworth filter with a default cutoff frequency of 60Hz and added to a
+    separate channel in the audio stream.
+
+    .. warning::
+
+        Disable this filter when you are playing media with an LFE channel
+        (e.g. 5.1 surround sound), otherwise this filter will disrupt the sound
+        to the subwoofer.
+
+    ``<fc>``
+        cutoff frequency in Hz for the low-pass filter (20Hz to 300Hz)
+        (default: 60Hz) For the best result try setting the cutoff frequency
+        as low as possible. This will improve the stereo or surround sound
+        experience.
+    ``<ch>``
+        Determines the channel number in which to insert the sub-channel
+        audio. Channel number can be between 0 and 7 (default: 5). Observe
+        that the number of channels will automatically be increased to <ch> if
+        necessary.
+
+    .. admonition:: Example
+
+        ``mpv --af=sub=100:4 --audio-channels=5 media.avi``
+            Would add a subwoofer channel with a cutoff frequency of 100Hz to
+            output channel 4.
+
+``center``
+    Creates a center channel from the front channels. May currently be low
+    quality as it does not implement a high-pass filter for proper extraction
+    yet, but averages and halves the channels instead.
+
+    ``<ch>``
+        Determines the channel number in which to insert the center channel.
+        Channel number can be between 0 and 7 (default: 5). Observe that the
+        number of channels will automatically be increased to ``<ch>`` if
+        necessary.
+
+``surround[=delay]``
+    Decoder for matrix encoded surround sound like Dolby Surround. Some files
+    with 2-channel audio actually contain matrix encoded surround sound.
+
+    ``<delay>``
+        delay time in ms for the rear speakers (0 to 1000) (default: 20) This
+        delay should be set as follows: If d1 is the distance from the
+        listening position to the front speakers and d2 is the distance from
+        the listening position to the rear speakers, then the delay should be
+        set to 15ms if d1 <= d2 and to 15 + 5*(d1-d2) if d1 > d2.
+
+    .. admonition:: Example
+
+        ``mpv --af=surround=15 --audio-channels=4 media.avi``
+            Would add surround sound decoding with 15ms delay for the sound to
+            the rear speakers.
+
+``delay[=[ch1,ch2,...]]``
+    Delays the sound to the loudspeakers such that the sound from the
+    different channels arrives at the listening position simultaneously. It is
+    only useful if you have more than 2 loudspeakers.
+
+    ``[ch1,ch2,...]``
+        The delay in ms that should be imposed on each channel (floating point
+        number between 0 and 1000).
+
+    To calculate the required delay for the different channels, do as follows:
+
+    1. Measure the distance to the loudspeakers in meters in relation to your
+       listening position, giving you the distances s1 to s5 (for a 5.1
+       system). There is no point in compensating for the subwoofer (you will
+       not hear the difference anyway).
+
+    2. Subtract the distances s1 to s5 from the maximum distance, i.e.
+       ``s[i] = max(s) - s[i]; i = 1...5``.
+
+    3. Calculate the required delays in ms as ``d[i] = 1000*s[i]/342; i =
+       1...5``.
+
+    .. admonition:: Example
+
+        ``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 subwoofer by 0ms and the center channel by 7ms.
+
+``export=mmapped_file:nsamples]``
+    Exports the incoming signal to other processes using memory mapping
+    (``mmap()``). Memory mapped areas contain a header::
+
+        int nch                      /* number of channels */
+        int size                     /* buffer size */
+        unsigned long long counter   /* Used to keep sync, updated every time
+                                        new data is exported. */
+
+    The rest is payload (non-interleaved) 16-bit data.
+
+    ``<mmapped_file>``
+        File to map data to (required)
+    ``<nsamples>``
+        number of samples per channel (default: 512).
+
+    .. admonition:: Example
+
+        ``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
+    adds some sort of "live" effect to playback.
+
+    ``<mul>``
+        Sets the difference coefficient (default: 2.5). 0.0 means mono sound
+        (average of both channels), with 1.0 sound will be unchanged, with
+        -1.0 left and right channels will be swapped.
+
+``drc[=method:target]``
+    Applies dynamic range compression. This maximizes the volume by compressing
+    the audio signal's dynamic range. (Formerly called ``volnorm``.)
+
+    ``<method>``
+        Sets the used method.
+
+        1
+            Use a single sample to smooth the variations via the standard
+            weighted mean over past samples (default).
+        2
+            Use several samples to smooth the variations via the standard
+            weighted mean over past samples.
+
+    ``<target>``
+        Sets the target amplitude as a fraction of the maximum for the sample
+        type (default: 0.25).
+
+    .. note::
+
+        This filter can cause distortion with audio signals that have a very
+        large dynamic range.
+
+``ladspa=file:label:[<control0>,<control1>,...]``
+    Load a LADSPA (Linux Audio Developer's Simple Plugin API) plugin. This
+    filter is reentrant, so multiple LADSPA plugins can be used at once.
+
+    ``<file>``
+        Specifies the LADSPA plugin library file.
+
+        .. note::
+
+            See also the note about the ``LADSPA_PATH`` variable in the
+            `ENVIRONMENT VARIABLES`_ section.
+    ``<label>``
+        Specifies the filter within the library. Some libraries contain only
+        one filter, but others contain many of them. Entering 'help' here
+        will list all available filters within the specified library, which
+        eliminates the use of 'listplugins' from the LADSPA SDK.
+    ``[<control0>,<control1>,...]``
+        Controls are zero or more ``,`` separated floating point values that
+        determine the behavior of the loaded plugin (for example delay,
+        threshold or gain).
+        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.
+        Note that ``,`` is already used by the option parser to separate
+        filters, so you must quote the list of values with ``[...]`` or
+        similar.
+
+    .. admonition:: Example
+
+        ``mpv --af=ladspa='/usr/lib/ladspa/delay.so':delay_5s:[0.5,0.2] media.avi``
+            Does something.
+
+``karaoke``
+    Simple voice removal filter exploiting the fact that voice is usually
+    recorded with mono gear and later 'center' mixed onto the final audio
+    stream. Beware that this filter will turn your signal into mono. Works
+    well for 2 channel tracks; do not bother trying it on anything but 2
+    channel stereo.

 ``scaletempo[=option1:option2:...]``
    Scales audio tempo without altering pitch, optionally synced to playback
@@ -162,10 +564,9 @@ Available filters are:
             Scale tempo in sync with speed (default).
        pitch
             Reverses effect of filter. Scales pitch without altering tempo.
-             Add this to your ``input.conf`` to step by musical semi-tones::
-
-                [ multiply speed 0.9438743126816935
-                ] multiply speed 1.059463094352953
+             Add ``[ speed_mult 0.9438743126816935`` and ``] speed_mult
+             1.059463094352953`` to your ``input.conf`` to step by musical
+             semi-tones.

             .. warning::

@@ -187,40 +588,19 @@ Available filters are:
            tempo.

        ``mpv --af=scaletempo=stride=30:overlap=.50:search=10 media.ogg``
-            Would tweak the quality and performance parameters.
+            Would tweak the quality and performace parameters.
+
+        ``mpv --af=format=float,scaletempo media.ogg``
+            Would make scaletempo use float code. Maybe faster on some
+            platforms.

        ``mpv --af=scaletempo=scale=1.2:speed=pitch audio.ogg``
            Would play media at 1.2x normal speed, with audio at normal pitch.
            Changing playback speed would change pitch, leaving audio tempo at
            1.2x.

-``rubberband``
-    High quality pitch correction with librubberband. This can be used in place
-    of ``scaletempo``, and will be used to adjust audio pitch when playing
-    at speed different from normal. It can also be used to adjust audio pitch
-    without changing playback speed.
-
-    ``<pitch-scale>``
-        Sets the pitch scaling factor. Frequencies are multiplied by this value.
-
-    This filter has a number of additional sub-options. You can list them with
-    ``mpv --af=rubberband=help``. This will also show the default values
-    for each option. The options are not documented here, because they are
-    merely passed to librubberband. Look at the librubberband documentation
-    to learn what each option does:
-    http://breakfastquay.com/rubberband/code-doc/classRubberBand_1_1RubberBandStretcher.html
-    (The mapping of the mpv rubberband filter sub-option names and values to
-    those of librubberband follows a simple pattern: ``"Option" + Name + Value``.)
-
-    This filter supports the following ``af-command`` commands:
-
-    ``set-pitch``
-        Set the ``<pitch-scale>`` argument dynamically. This can be used to
-        change the playback pitch at runtime. Note that speed is controlled
-        using the standard ``speed`` property, not ``af-command``.
-
 ``lavfi=graph``
-    Filter audio using FFmpeg's libavfilter.
+    Filter audio using ffmpeg's libavfilter.

    ``<graph>``
        Libavfilter graph. See ``lavfi`` video filter for details - the graph
@@ -233,3 +613,4 @@ Available filters are:

    ``o=<string>``
        AVOptions.
+
@@ -4,74 +4,105 @@ AUDIO OUTPUT DRIVERS
 Audio output drivers are interfaces to different audio output facilities. The
 syntax is:

-``--ao=<driver1,driver2,...[,]>``
+``--ao=<driver1[:suboption1[=value]:...],driver2,...[,]>``
    Specify a priority list of audio output drivers to be used.

 If the list has a trailing ',', mpv will fall back on drivers not contained
-in the list.
+in the list. Suboptions are optional and can mostly be omitted.
+
+You can also set defaults for each driver. The defaults are applied before the
+normal driver parameters.
+
+``--ao-defaults=<driver1[:parameter1:parameter2:...],driver2,...>``
+    Set defaults for each driver.

 .. note::

    See ``--ao=help`` for a list of compiled-in audio output drivers. The
    driver ``--ao=alsa`` is preferred. ``--ao=pulse`` is preferred on systems
-    where PulseAudio is used. On BSD systems, ``--ao=oss`` or ``--ao=sndio``
-    may work (the latter being experimental).
+    where PulseAudio is used. On Windows, ``--ao=wasapi`` is preferred,
+    though it might cause trouble sometimes, in which case ``--ao=dsound``
+    should be used. On BSD systems, ``--ao=oss`` or `--ao=sndio`` may work
+    (the latter being experimental). On OSX systems, use ``--ao=coreaudio``.
+
+.. admonition:: Examples
+
+    - ``--ao=alsa,oss,`` Try the ALSA driver, then the OSS driver, then others.
+    - ``--ao=alsa:no-block:device=[hw:0,3]`` Sets noblock-mode and the
+      device-name as first card, fourth device.

 Available audio output drivers are:

 ``alsa`` (Linux only)
    ALSA audio output driver

-    See `ALSA audio output options`_ for options specific to this AO.
+    ``device=<device>``
+        Sets the device name. For ac3 output via S/PDIF, use an "iec958" or
+        "spdif" device, unless you really know how to set it correctly.
+    ``no-block``
+        Sets noblock-mode.
+    ``resample=yes``
+        Enable ALSA resampling plugin. (This is disabled by default, because
+        some drivers report incorrect audio delay in some cases.)
+    ``mixer-device=<device>``
+        Set the mixer device used with ``--no-softvol`` (default: ``default``).
+    ``mixer-name=<name>``
+        Set the name of the mixer element (default: ``Master``). This is for
+        example ``PCM`` or ``Master``.
+    ``mixer-index=<number>``
+        Set the index of the mixer channel (default: 0). Consider the output of
+        "``amixer scontrols``", then the index is the number that follows the
+        name of the element.

-    .. warning::
+    .. note::

-        To get multichannel/surround audio, use ``--audio-channels=auto``. The
-        default for this option is ``auto-safe``, which makes this audio otuput
-        explicitly reject multichannel output, as there is no way to detect
-        whether a certain channel layout is actually supported.
+        MPlayer and mplayer2 required you to replace any ',' with '.' and
+        any ':' with '=' in the ALSA device name. mpv does not do this anymore.
+        Instead, quote the device name:

-        You can also try `using the upmix plugin <http://git.io/vfuAy>`_.
-        This setup enables multichannel audio on the ``default`` device
-        with automatic upmixing with shared access, so playing stereo
-        and multichannel audio at the same time will work as expected.
+            ``--ao=alsa:device=[plug:surround50]``
+
+        Note that the ``[`` and ``]`` simply quote the device name. With some
+        shells (like zsh), you have to quote the option string to prevent the
+        shell from interpreting the brackets instead of passing them to mpv.

 ``oss``
    OSS audio output driver

-    The following global options are supported by this audio output:
-
-    ``--oss-mixer-device``
+    ``<dsp-device>``
+        Sets the audio output device (default: ``/dev/dsp``).
+    ``<mixer-device>``
        Sets the audio mixer device (default: ``/dev/mixer``).
-    ``--oss-mixer-channel``
+    ``<mixer-channel>``
        Sets the audio mixer channel (default: ``pcm``). Other valid values
        include **vol, pcm, line**. For a complete list of options look for
        ``SOUND_DEVICE_NAMES`` in ``/usr/include/linux/soundcard.h``.

 ``jack``
-    JACK (Jack Audio Connection Kit) audio output driver.
+    JACK (Jack Audio Connection Kit) audio output driver

-    The following global options are supported by this audio output:
-
-    ``--jack-port=<name>``
+    ``port=<name>``
        Connects to the ports with the given name (default: physical ports).
-    ``--jack-name=<client>``
+    ``name=<client>``
        Client name that is passed to JACK (default: ``mpv``). Useful
        if you want to have certain connections established automatically.
-    ``--jack-autostart=<yes|no>``
+    ``(no-)autostart``
        Automatically start jackd if necessary (default: disabled). Note that
        this tends to be unreliable and will flood stdout with server messages.
-    ``--jack-connect=<yes|no>``
+    ``(no-)connect``
        Automatically create connections to output ports (default: enabled).
        When enabled, the maximum number of output channels will be limited to
        the number of available output ports.
-    ``--jack-std-channel-layout=<waveext|any>``
-        Select the standard channel layout (default: waveext). JACK itself has no
+    ``std-channel-layout=alsa|waveext|any``
+        Select the standard channel layout (default: alsa). JACK itself has no
        notion of channel layouts (i.e. assigning which speaker a given
        channel is supposed to map to) - it just takes whatever the application
        outputs, and reroutes it to whatever the user defines. This means the
        user and the application are in charge of dealing with the channel
-        layout. ``waveext`` uses WAVE_FORMAT_EXTENSIBLE order, which, even
+        layout. ``alsa`` uses the old MPlayer layout, which is inspired by
+        ALSA's standard layouts. In this mode, ao_jack will refuse to play 3
+        or 7 channels (because these do not really have a defined meaning in
+        MPlayer). ``waveext`` uses WAVE_FORMAT_EXTENSIBLE order, which, even
        though it was defined by Microsoft, is the standard on many systems.
        The value ``any`` makes JACK accept whatever comes from the audio
        filter chain, regardless of channel layout and without reordering. This
@@ -79,35 +110,12 @@ Available audio output drivers are:
        with fixed setups.

 ``coreaudio`` (Mac OS X only)
-    Native Mac OS X audio output driver using AudioUnits and the CoreAudio
-    sound server.
+    Native Mac OS X audio output driver

-    Automatically redirects to ``coreaudio_exclusive`` when playing compressed
-    formats.
-
-    The following global options are supported by this audio output:
-
-    ``--coreaudio-change-physical-format=<yes|no>``
-        Change the physical format to one similar to the requested audio format
-        (default: no). This has the advantage that multichannel audio output
-        will actually work. The disadvantage is that it will change the
-        system-wide audio settings. This is equivalent to changing the ``Format``
-        setting in the ``Audio Devices`` dialog in the ``Audio MIDI Setup``
-        utility. Note that this does not affect the selected speaker setup.
-
-    ``--coreaudio-spdif-hack=<yes|no>``
-        Try to pass through AC3/DTS data as PCM. This is useful for drivers
-        which do not report AC3 support. It converts the AC3 data to float,
-        and assumes the driver will do the inverse conversion, which means
-        a typical A/V receiver will pick it up as compressed IEC framed AC3
-        stream, ignoring that it's marked as PCM. This disables normal AC3
-        passthrough (even if the device reports it as supported). Use with
-        extreme care.
-
-
-``coreaudio_exclusive`` (Mac OS X only)
-    Native Mac OS X audio output driver using direct device access and
-    exclusive mode (bypasses the sound server).
+    ``device_id=<id>``
+        ID of output device to use (0 = default device)
+    ``help``
+        List all available output devices with their IDs.

 ``openal``
    Experimental OpenAL audio output driver
@@ -118,28 +126,38 @@ Available audio output drivers are:
 ``pulse``
    PulseAudio audio output driver

-    The following global options are supported by this audio output:
+    ``[<host>][:<output sink>]``
+        Specify the host and optionally output sink to use. An empty <host>
+        string uses a local connection, "localhost" uses network transfer
+        (most likely not what you want).

-    ``--pulse-host=<host>``
-        Specify the host to use. An empty <host> string uses a local connection,
-        "localhost" uses network transfer (most likely not what you want).
-
-    ``--pulse-buffer=<1-2000|native>``
+    ``buffer=<1-2000|native>``
        Set the audio buffer size in milliseconds. A higher value buffers
        more data, and has a lower probability of buffer underruns. A smaller
        value makes the audio stream react faster, e.g. to playback speed
        changes. Default: 250.

-    ``--pulse-latency-hacks=<yes|no>``
-        Enable hacks to workaround PulseAudio timing bugs (default: no). If
-        enabled, mpv will do elaborate latency calculations on its own. If
-        disabled, it will use PulseAudio automatically updated timing
-        information. Disabling this might help with e.g. networked audio or
-        some plugins, while enabling it might help in some unknown situations
-        (it used to be required to get good behavior on old PulseAudio versions).
+``portaudio``
+    PortAudio audio output driver. This works on all platforms, and has
+    extensive MS Windows support.

-        If you have stuttering video when using pulse, try to enable this
-        option. (Or try to update PulseAudio.)
+    .. note:: This driver is not very useful. It was added in the hope of
+              providing portable audio API across all platforms, but turned
+              out semi-broken and underfeatured.
+
+    ``device``
+        Specify the subdevice to use. Giving ``help`` as device name lists all
+        devices found by PortAudio. Devices can be given as numeric values,
+        starting from ``1``.
+
+``dsound`` (Windows only)
+    DirectX DirectSound audio output driver
+
+    .. note:: This driver is for compatibility with old systems.
+
+    ``device=<devicenum>``
+        Sets the device number to use. Playing a file with ``-v`` will show a
+        list of available devices.

 ``sdl``
    SDL 1.2+ audio output driver. Should work on any platform supported by SDL
@@ -150,79 +168,69 @@ Available audio output drivers are:
              environments, such as systems where none of the other drivers
              are available.

-    The following global options are supported by this audio output:
-
-    ``--sdl-buflen=<length>``
+    ``buflen=<length>``
        Sets the audio buffer length in seconds. Is used only as a hint by the
        sound system. Playing a file with ``-v`` will show the requested and
        obtained exact buffer size. A value of 0 selects the sound system
        default.

-    ``--sdl-bufcnt=<count>``
+    ``bufcnt=<count>``
        Sets the number of extra audio buffers in mpv. Usually needs not be
        changed.

 ``null``
-    Produces no audio output but maintains video playback speed. You can use
-    ``--ao=null --ao-null-untimed`` for benchmarking.
+    Produces no audio output but maintains video playback speed. Use
+    ``--ao=null:untimed`` for benchmarking.

-    The following global options are supported by this audio output:
-
-    ``--ao-null-untimed``
+    ``untimed``
        Do not simulate timing of a perfect audio device. This means audio
        decoding will go as fast as possible, instead of timing it to the
        system clock.

-    ``--ao-null-buffer``
+    ``buffer``
        Simulated buffer length in seconds.

-    ``--ao-null-outburst``
+    ``outburst``
        Simulated chunk size in samples.

-    ``--ao-null-speed``
+    ``speed``
        Simulated audio playback speed as a multiplier. Usually, a real audio
        device will not go exactly as fast as the system clock. It will deviate
-        just a little, and this option helps to simulate this.
+        just a little, and this option helps simulating this.

-    ``--ao-null-latency``
+    ``latency``
        Simulated device latency. This is additional to EOF.

-    ``--ao-null-broken-eof``
+    ``broken-eof``
        Simulate broken audio drivers, which always add the fixed device
        latency to the reported audio playback position.

-    ``--ao-null-broken-delay``
-        Simulate broken audio drivers, which don't report latency correctly.
-
-    ``--ao-null-channel-layouts``
-        If not empty, this is a ``,`` separated list of channel layouts the
-        AO allows. This can be used to test channel layout selection.
-
 ``pcm``
    Raw PCM/WAVE file writer audio output

-    The following global options are supported by this audio output:
-
-    ``--ao-pcm-waveheader=<yes|no>``
+    ``(no-)waveheader``
        Include or do not include the WAVE header (default: included). When
        not included, raw PCM will be generated.
-    ``--ao-pcm-file=<filename>``
+    ``file=<filename>``
        Write the sound to ``<filename>`` instead of the default
        ``audiodump.wav``. If ``no-waveheader`` is specified, the default is
        ``audiodump.pcm``.
-    ``--ao-pcm-append=<yes|no>``
-        Append to the file, instead of overwriting it. Always use this with the
-        ``no-waveheader`` option - with ``waveheader`` it's broken, because
-        it will write a WAVE header every time the file is opened.

 ``rsound``
-    Audio output to an RSound daemon. Use ``--audio-device=rsound/<hostname>``
-    to set the host name (with ``<hostname>`` replaced, without the ``< >``).
+    Audio output to an RSound daemon

    .. note:: Completely useless, unless you intend to run RSound. Not to be
              confused with RoarAudio, which is something completely
              different.

+    ``host=<name/path>``
+        Set the address of the server (default: localhost).  Can be either a
+        network hostname for TCP connections or a Unix domain socket path
+        starting with '/'.
+    ``port=<number>``
+        Set the TCP port used for connecting to the server (default: 12345).
+        Not used if connecting to a Unix domain socket.
+
 ``sndio``
    Audio output to the OpenBSD sndio sound system

@@ -231,5 +239,25 @@ Available audio output drivers are:
    (Note: only supports mono, stereo, 4.0, 5.1 and 7.1 channel
    layouts.)

+    ``device=<device>``
+        sndio device to use (default: ``$AUDIODEVICE``, resp. ``snd0``).
+
 ``wasapi``
    Audio output to the Windows Audio Session API.
+
+    ``device=<id>``
+        Uses the requested endpoint instead of the system's default audio
+        endpoint. Both the number and the ID String are valid; the ID String
+        is guaranteed to not change unless the driver is uninstalled.
+
+        Also supports searching active devices by name. If more than one
+        device matches the name, refuses loading it.
+
+        To get a list of the valid devices, give ``help`` as the id. The
+        list is the same as the ``list`` suboption, but stops the player
+        initialization.
+    ``exclusive``
+        Requests exclusive, direct hardware access. By definition prevents
+        sound playback of any other program until mpv exits.
+    ``list``
+        Lists all audio endpoints (output devices) present in the system.
@@ -1,18 +1,371 @@
-CHANGELOG
-=========
+CHANGES FROM OTHER VERSIONS OF MPLAYER
+======================================

-There is no real changelog, but you can look at the following things:
+**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, a
+large part of which is incompatible or completely changes how the player
+behaves. Although there are still many similarities to its ancestors, **mpv**
+should generally be treated as a completely different program.

-* The release changelog, which should contain most user-visible changes,
-  including new features and bug fixes:
+.. note::
+    These lists are incomplete.

-  https://github.com/mpv-player/mpv/releases
-* The git log, which is the "real" changelog
-* The files ``client-api-changes.rst`` and ``interface-changes.rst`` in the
-  ``DOCS`` sub directoryon the git repository, which document API and user
-  interface changes (the latter usually documents breaking changes only, rather
-  than additions).
-* The file ``mplayer-changes.rst`` in the ``DOCS`` sub directory on the git
-  repository, which used to be in place of this section. It documents some
-  changes that happened since mplayer2 forked off MPlayer. (Not updated
-  anymore.)
+General Changes for MPlayer to mpv
+----------------------------------
+
+* Switch to GPLv2+. (Technically speaking, MPlayer as a whole seems to be
+  GPLv2-only, while mplayer2 is GPLv3+ - see ``Copyright`` file for details.)
+* Removal of the internal GUI, MEncoder, OSD menu, video kernel drivers for
+  Linux 2.4 (including VIDIX)
+* Large internal cleanups
+* Removal of support for dead platforms
+* New buildsystem
+* No embedded copy of ffmpeg and other libraries
+* Better pause handling (do not unpause on a command)
+* Better MKV support (such as ordered chapters)
+* vo_vdpau improvements
+* Precise seeking support
+* Native OpenGL backend for OSX
+* General OSX improvements
+* Improvements in audio/video sync handling
+* Cleaned up terminal output
+* Gapless audio support (``--gapless-audio``)
+* Improved responsiveness on user input
+* Support for modifier keys (alt, shift, ctrl) in input.conf
+* OSS4 volume control
+* More correct color reproduction (color matrix generation)
+* Use libass for subtitle rendering by default (better quality)
+* Generally preferring ffmpeg/libav over internal demuxers and decoders
+* Improvements when playing multiple files (``--fixed-vo``)
+* Screenshot improvements (instant screenshots without 1-frame delay, allow
+  taking screenshots even with hardware decoding)
+* Improved support for PulseAudio
+* Generally improved MS Windows support (dealing with unicode filenames,
+  improved ``--vo=direct3d``, improved window handling)
+* Better OSD rendering (using libass). This has full unicode support, and
+  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. ``mpv https://www.youtube.com/watch?v=...``)
+* Improved OpenGL output (``--vo=opengl-hq``)
+* Make ``--softvol`` default (**mpv** is not a mixer control panel)
+* Improved support for .cue files
+* Screenshot improvements (can save screenshots as JPG or PNG, configurable
+  filenames, support for taking screenshots with or without subtitles - the
+  ``screenshot`` video filter is not needed anymore, and should not be put
+  into the mpv config file)
+* Removal of teletext support
+* Removal of most builtin demuxers, using libavformat instead
+* Removal of builtin network support, using libavformat instead (also,
+  support https via libavformat)
+* Replace image VOs (``--vo=jpeg`` etc.) with ``--vo=image``
+* Do not lose settings when playing a new file in the same player instance
+* New location for config files, new name for the binary.
+* Slave mode compatibility broken (see below)
+* Encoding functionality (replacement for mencoder, see ``DOCS/encoding.rst``)
+* Remove ``--vo=gif89a``, ``--vo=md5sum``, ``--vo=yuv4mpeg``, as encoding can
+  handle these use cases. For yuv4mpeg, for example, use:
+  ``mpv input.mkv -o output.y4m --no-audio --oautofps --oneverdrop``.
+* Image subtitles (DVDs etc.) are rendered in color and use more correct
+  positioning (color can be disabled with ``--sub-gray``)
+* Wayland support
+* Support for precise scrolling which scales the parameter of commands. If the
+  input doesn't support precise scrolling the scale factor stays 1.
+* OSX: Cocoa event loop is independent from mplayer's event loop, so user
+  actions like accessing menus and live resizing do not block the playback.
+* OSX: Apple Remote support.
+* OSX: Media Keys support.
+* Windows: Added WASAPI audio output.
+* New OSD bar with chapter marks and not positioned in the middle of the video
+  (though this can be customized with the ``--osd-bar-align-y`` option).
+* Allow customizing whether a key binding for seeking shows the video time, the
+  OSD bar, or nothing (see section `Input Command Prefixes`_).
+* Display list of chapters and audio/subtitle tracks on OSD (see section
+  `Properties`_).
+* ``--keep-open`` option to stop the player from closing the window and
+  exiting after playback ends.
+* Re-enable screensaver while the player is paused.
+* Matroska edition switching at runtime.
+* Support for libavfilter (for video->video and audio->audio). This allows
+  using most of FFmpeg's filters, which improve greatly on the old MPlayer
+  filters in features, performance, and correctness.
+* Improved downmixing and output of surround audio. Instead of using hardcoded
+  pan filters to do remixing, use libavresample. Channel maps are used to
+  identify the channel layout, so e.g. ``3.0`` and ``2.1`` audio can be
+  distinguished.
+* Allow resuming playback at a later point with ``Shift+q``, also see
+  ``quit_watch_later`` input command.
+* Support mapping multiple commands to one key.
+* Allow changing/adjusting video filters at runtime. (This is also used to make
+  the ``D`` key insert vf_yadif if deinterlacing is not supported otherwise.)
+* Native VAAPI support
+* OSX: VDA support using libavcodec hwaccel API insted of FFmpeg's decoder. Up
+  to 2-2.5x reduction in CPU usage.
+* Make hardware decoding in general work with the ``opengl`` video output.
+* Lua scripting (see `LUA SCRIPTING`_)
+* A client API, that allows embedding **mpv** into applications
+  (see ``libmpv/client.h`` in the sources)
+* General bug fixes and removal of long-standing issues
+* General code cleanups (including refactoring or rewrites of many parts)
+* Many more changes
+
+Detailed Listing of User-visible Changes
+----------------------------------------
+
+This listing is about changed command line switches, slave commands, and similar
+things. Completely removed features are not listed.
+
+Command Line Switches
+~~~~~~~~~~~~~~~~~~~~~
+
+* There is a new command line syntax, which is generally preferred over the old
+  syntax. ``-optname optvalue`` becomes ``--optname=optvalue``.
+
+  The old syntax will not be removed. However, the new syntax is mentioned in
+  all documentation and so on, and unlike the old syntax is not ambiguous,
+  so it is a good thing to know about this change.
+* In general, negating switches like ``-noopt`` now have to be written as
+  ``-no-opt`` or ``--no-opt``.
+* Per-file options are not the default anymore. You can explicitly specify
+  file-local options. See ``Usage`` section.
+* Many options have been renamed, removed or changed semantics. Some options
+  that are required for a good playback experience with MPlayer are now
+  superfluous or even worse than the defaults, so make sure to read the manual
+  before trying to use your existing configuration with **mpv**.
+* Table of renamed/replaced switches:
+
+    =========================== ========================================
+    Old                         New
+    =========================== ========================================
+    ``-no<opt>``                ``--no-<opt>`` (add a dash)
+    ``-a52drc level``           ``--ad-lavc-ac3drc=level``
+    ``-ac spdifac3``            ``--ad=spdif:ac3`` (see ``--ad=help``)
+    ``-af volnorm``             ``--af=drc`` (renamed)
+    ``-afm hwac3``              ``--ad=spdif:ac3,spdif:dts``
+    ``-ao alsa:device=hw=0.3``  ``--ao=alsa:device=[hw:0,3]``
+    ``-aspect``                 ``--video-aspect``
+    ``-ass-bottom-margin``      ``--vf=sub=bottom:top``
+    ``-ass``                    ``--sub-ass``
+    ``-audiofile-cache``        (removed; the main cache settings are used)
+    ``-audiofile``              ``--audio-file``
+    ``-benchmark``              ``--untimed`` (no stats)
+    ``-capture``                ``--stream-capture=<filename>``
+    ``-channels``               ``--audio-channels`` (changed semantics)
+    ``-cursor-autohide-delay``  ``--cursor-autohide``
+    ``-delay``                  ``--audio-delay``
+    ``-dumpstream``             ``--stream-dump=<filename>``
+    ``-dvdangle``               ``--dvd-angle``
+    ``-endpos``                 ``--length``
+    ``-font``                   ``--osd-font``
+    ``-forcedsubsonly``         ``--sub-forced-only``
+    ``-forceidx``               ``--index``
+    ``-format``                 ``--audio-format``
+    ``-fsmode-dontuse``         (removed)
+    ``-fstype``                 ``--x11-netwm`` (changed semantics)
+    ``-hardframedrop``          ``--framedrop=hard``
+    ``-identify``               (removed; use TOOLS/mpv_identify.sh)
+    ``-idx``                    ``--index``
+    ``-lavdopts ...``           ``--vd-lavc-...``
+    ``-lavfdopts``              ``--demuxer-lavf-...``
+    ``-lircconf``               ``--input-lirc-conf``
+    ``-loop 0``                 ``--loop=inf``
+    ``-mixer-channel``          AO suboptions (``alsa``, ``oss``)
+    ``-mixer``                  AO suboptions (``alsa``, ``oss``)
+    ``-mouse-movements``        ``--input-cursor``
+    ``-msgcolor``               ``--msg-color``
+    ``-msglevel``               ``--msg-level`` (changed semantics)
+    ``-msgmodule``              ``--msg-module``
+    ``-name``                   ``--x11-name``
+    ``-noar``                   ``--no-input-appleremote``
+    ``-noautosub``              ``--no-sub-auto``
+    ``-noconsolecontrols``      ``--no-input-terminal``
+    ``-nojoystick``             ``--no-input-joystick``
+    ``-nosound``                ``--no-audio``
+    ``-osdlevel``               ``--osd-level``
+    ``-panscanrange``           ``--video-zoom``, ``--video-pan-x/y``
+    ``-playing-msg``            ``--term-playing-msg``
+    ``-pp ...``                 ``'--vf=pp=[...]'``
+    ``-pphelp``                 ``--vf=pp:help``
+    ``-rawaudio ...``           ``--demuxer-rawaudio-...``
+    ``-rawvideo ...``           ``--demuxer-rawvideo-...``
+    ``-spugauss``               ``--sub-gauss``
+    ``-srate``                  ``--audio-samplerate``
+    ``-ss``                     ``--start``
+    ``-ssf <sub>``              ``--sws-...``
+    ``-stop-xscreensaver``      ``--stop-screensaver``
+    ``-sub-fuzziness``          ``--sub-auto``
+    ``-sub``                    ``--sub-file``
+    ``-subcp``                  ``--sub-codepage``
+    ``-subdelay``               ``--sub-delay``
+    ``-subfile``                ``--sub-file``
+    ``-subfont-*``              ``--sub-text-*``, ``--osd-*``
+    ``-subfont-text-scale``     ``--sub-scale``
+    ``-subfont``                ``--sub-text-font``
+    ``-subfps``                 ``--sub-fps``
+    ``-subpos``                 ``--sub-pos``
+    ``-sws``                    ``--sws-scaler``
+    ``-tvscan``                 ``--tv-scan``
+    ``-use-filename-title``     ``--title='${filename}'``
+    ``-vc ffh264vdpau`` (etc.)  ``--hwdec=vdpau``
+    ``-vobsub``                 ``--sub-file`` (pass the .idx file)
+    ``-x W``, ``-y H``          ``--geometry=WxH`` + ``--no-keepaspect``
+    ``-xineramascreen``         ``--screen`` (different values)
+    ``-xy W``                   ``--autofit=W``
+    ``-zoom``                   Inverse available as ``--video-unscaled``
+    ``dvdnav://``               ``dvdnav://menu``
+    ``dvd://1``                 ``dvd://0`` (0-based offset)
+    =========================== ========================================
+
+.. note::
+
+    ``-opt val`` becomes ``--opt=val``.
+
+.. note::
+
+    Quite some video filters, video outputs, audio filters, audio outputs, had
+    changes in their option parsing. These aren't mentioned in the table above.
+
+    Also, some video and audio filters have been removed, and you have to use
+    libavfilter (using ``--vf=lavfi=[...]`` or ``--af=lavfi=[...]``) to get
+    them back.
+
+input.conf and Slave Commands
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* 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, a warning will be printed when starting the player. The warnings
+    also show the replacement commands.
+
+    Properties containing ``_`` to separate words use ``-`` instead.
+
+    +--------------------------------+----------------------------------------+
+    | Old                            | New                                    |
+    +================================+========================================+
+    | ``pt_step 1 [0|1]``            | ``playlist_next [weak|force]``         |
+    |                                | (translation layer cannot deal with    |
+    |                                | whitespace)                            |
+    +--------------------------------+----------------------------------------+
+    | ``pt_step -1 [0|1]``           | ``playlist_prev [weak|force] (same)``  |
+    +--------------------------------+----------------------------------------+
+    | ``switch_ratio [<ratio>]``     | ``set video-aspect <ratio>``           |
+    |                                |                                        |
+    |                                | ``set video-aspect 0`` (reset aspect)  |
+    +--------------------------------+----------------------------------------+
+    | ``step_property_osd <prop>``   | ``cycle <prop> <step>`` (wraps),       |
+    | ``<step> <dir>``               | ``add <prop> <step>`` (clamps).        |
+    |                                | ``<dir>`` parameter unsupported. Use   |
+    |                                | a negative ``<step>`` instead.         |
+    +--------------------------------+----------------------------------------+
+    | ``step_property <prop>``       | Prefix ``cycle`` or ``add`` with       |
+    | ``<step> <dir>``               | ``no-osd``: ``no-osd cycle <prop>``    |
+    |                                | ``<step>``                             |
+    +--------------------------------+----------------------------------------+
+    | ``osd_show_property_text``     | ``show_text <text>``                   |
+    | ``<text>``                     | The property expansion format string   |
+    |                                | syntax slightly changed.               |
+    +--------------------------------+----------------------------------------+
+    | ``osd_show_text``              | Now does the same as                   |
+    |                                | ``osd_show_property_text``. Use the    |
+    |                                | ``raw`` prefix to disable property     |
+    |                                | expansion.                             |
+    +--------------------------------+----------------------------------------+
+    | ``show_tracks``                | ``show_text ${track-list}``            |
+    +--------------------------------+----------------------------------------+
+    | ``show_chapters``              | ``show_text ${chapter-list}``          |
+    +--------------------------------+----------------------------------------+
+    | ``af_switch``, ``af_add``, ... | ``af set|add|...``                     |
+    +--------------------------------+----------------------------------------+
+    | ``tv_start_scan``              | ``set tv-scan yes``                    |
+    +--------------------------------+----------------------------------------+
+    | ``tv_set_channel <val>``       | ``set tv-channel <val>``               |
+    +--------------------------------+----------------------------------------+
+    | ``tv_step_channel``            | ``cycle tv-channel``                   |
+    +--------------------------------+----------------------------------------+
+    | ``dvb_set_channel <v1> <v2>``  | ``set dvb-channel <v1>-<v2>``          |
+    +--------------------------------+----------------------------------------+
+    | ``dvb_step_channel``           | ``cycle dvb-channel``                  |
+    +--------------------------------+----------------------------------------+
+    | ``tv_set_freq <val>``          | ``set tv-freq <val>``                  |
+    +--------------------------------+----------------------------------------+
+    | ``tv_step_freq``               | ``cycle tv-freq``                      |
+    +--------------------------------+----------------------------------------+
+    | ``tv_set_norm <norm>``         | ``set tv-norm <norm>``                 |
+    +--------------------------------+----------------------------------------+
+    | ``tv_step_norm``               | ``cycle tv-norm``                      |
+    +--------------------------------+----------------------------------------+
+
+    .. note::
+
+        Due to lack of hardware and users using the TV/DVB/PVR features, and
+        due to the need to cleanup the related command code, it's possible
+        that the new commands are buggy or behave worse. This can be improved
+        if testers are available. Otherwise, some of the TV code will be
+        removed at some point.
+
+Slave mode
+~~~~~~~~~~
+
+* 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
+  it right. The main problem is that slave mode is a bad and incomplete
+  interface, and to get around that, applications parsed output messages
+  intended for users. It is hard to know which messages exactly are parsed by
+  slave mode applications. This makes it virtually impossible to improve
+  terminal output intended for users without possibly breaking something.
+
+  This is absolutely insane, and **mpv** will not try to keep slave mode
+  compatible. If you are a developer of a slave mode application, contact us,
+  and a new and better protocol can be developed.
+
+  ``--identify`` was already removed (``TOOLS/mpv_identify.sh`` is provided
+  instead), and ``--slave-broken`` might be removed in the future.
+
+* **mpv** also provides a client API, which can be used to embed the player
+  by loading it as shared library. (See ``libmpv/client.h`` in the sources.)
+  It might also be possible to implement a custom slave mode-like protocol
+  using Lua scripting.
+
+* A slave protocol is planned, but nothing has emerged yet.
+
+Policy for Removed Features
+---------------------------
+
+**mpv** is in active development. If something is in the way of more important
+development (such as fixing bugs or implementing new features), we sometimes
+remove features. Usually this happens only with old features that either seem
+to be useless, or are not used by anyone. Often these are obscure, or
+"inherited", or were marked experimental, but never received any particular
+praise by any users.
+
+Sometimes, features are replaced by something new. The new code will be either
+simpler or more powerful, but doesn't necessarily provide everything the old
+feature did.
+
+We can not exclude that we accidentally remove features that are actually
+popular. Generally, we do not know how much a specific functionality is used.
+If you miss a feature and think it should be re-added, please open an issue
+on the mpv bug tracker. Hopefully, a solution can be found. Often, it turns
+out that re-adding something is not much of a problem, or that there are
+better alternatives.
+
+Why this Fork?
+--------------
+
+mplayer2 is practically dead, and mpv started out as a branch containing
+new/experimental development. (Some of it was merged right *after* the fork
+was made public, seemingly as an acknowledgment that development, or at
+least merging, should have been more active.)
+
+MPlayer is focused on not breaking anything, but is stuck with a horrible
+codebase resistant to cleanup. (Unless you do what mpv did - merciless and
+consequent pruning of bad, old code.) Cleanup and keeping broken things
+conflict, so the kind of development mpv strives for can't be done within
+MPlayer due to clashing development policies.
+
+Additionally, mplayer2 already had lots of changes over MPlayer, which would
+have needed to be backported to the MPlayer codebase. This would not only
+have been hard (several years of diverging development), but also would have
+been impossible due to the aforementioned MPlayer development policy.
@@ -38,7 +38,7 @@ You can encode files from one format/codec to another using this facility.

 ``--oautofps``
    Sets the output format time base to the guessed frame rate of the input
-    video (simulates MEncoder behavior, useful for AVI; may cause frame drops).
+    video (simulates mencoder behavior, useful for AVI; may cause frame drops).
    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.
@@ -74,7 +74,7 @@ You can encode files from one format/codec to another using this facility.
    .. admonition:: Example

        "``--oac=libmp3lame --oacopts=b=128000``"
-            selects 128 kbps MP3 encoding.
+            selects 128kbps MP3 encoding.

    Options are managed in lists. There are a few commands to manage the
    options list.
@@ -93,8 +93,8 @@ You can encode files from one format/codec to another using this facility.
        Completely empties the options list.

 ``--oafirst``
-    Force the audio stream to become the first stream in the output.
-    By default, the order is unspecified.
+    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. This can be a comma separated list of
@@ -111,7 +111,7 @@ You can encode files from one format/codec to another using this facility.

    .. admonition:: Examples

-        ``"--ovc=mpeg4 --ovcopts=qscale=5"``
+        ``"--ovc=mpeg4 --oacopts=qscale=5"``
            selects constant quantizer scale 5 for MPEG-4 encoding.

        ``"--ovc=libx264 --ovcopts=crf=23"``
@@ -134,8 +134,8 @@ You can encode files from one format/codec to another using this facility.
        Completely empties the options list.

 ``--ovfirst``
-    Force the video stream to become the first stream in the output.
-    By default, the order is unspecified.
+    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
@@ -1,268 +0,0 @@
-JSON IPC
-========
-
-mpv can be controlled by external programs using the JSON-based IPC protocol.
-It can be enabled by specifying the path to a unix socket or a named pipe using
-the option ``--input-ipc-server``. Clients can connect to this socket and send
-commands to the player or receive events from it.
-
-.. warning::
-
-    This is not intended to be a secure network protocol. It is explicitly
-    insecure: there is no authentication, no encryption, and the commands
-    themselves are insecure too. For example, the ``run`` command is exposed,
-    which can run arbitrary system commands. The use-case is controlling the
-    player locally. This is not different from the MPlayer slave protocol.
-
-Socat example
-------------
-
-You can use the ``socat`` tool to send commands (and receive replies) from the
-shell. Assuming mpv was started with:
-
-::
-
-    mpv file.mkv --input-ipc-server=/tmp/mpvsocket
-
-Then you can control it using socat:
-
-::
-
-    > echo '{ "command": ["get_property", "playback-time"] }' | socat - /tmp/mpvsocket
-    {"data":190.482000,"error":"success"}
-
-In this case, socat copies data between stdin/stdout and the mpv socket
-connection.
-
-See the ``--idle`` option how to make mpv start without exiting immediately or
-playing a file.
-
-It's also possible to send input.conf style text-only commands:
-
-::
-
-    > echo 'show-text ${playback-time}' | socat - /tmp/mpvsocket
-
-But you won't get a reply over the socket. (This particular command shows the
-playback time on the player's OSD.)
-
-Command Prompt example
----------------------
-
-Unfortunately, it's not as easy to test the IPC protocol on Windows, since
-Windows ports of socat (in Cygwin and MSYS2) don't understand named pipes. In
-the absence of a simple tool to send and receive from bidirectional pipes, the
-``echo`` command can be used to send commands, but not receive replies from the
-command prompt.
-
-Assuming mpv was started with:
-
-::
-
-    mpv file.mkv --input-ipc-server=\\.\pipe\mpvsocket
-
-You can send commands from a command prompt:
-
-::
-
-    echo show-text ${playback-time} >\\.\pipe\mpvsocket
-
-To be able to simultaneously read and write from the IPC pipe, like on Linux,
-it's necessary to write an external program that uses overlapped file I/O (or
-some wrapper like .NET's NamedPipeClientStream.)
-
-Protocol
--------
-
-Clients can execute commands on the player by sending JSON messages of the
-following form:
-
-::
-
-    { "command": ["command_name", "param1", "param2", ...] }
-
-where ``command_name`` is the name of the command to be executed, followed by a
-list of parameters. Parameters must be formatted as native JSON values
-(integers, strings, booleans, ...). Every message **must** be terminated with
-``\n``. Additionally, ``\n`` must not appear anywhere inside the message. In
-practice this means that messages should be minified before being sent to mpv.
-
-mpv will then send back a reply indicating whether the command was run
-correctly, and an additional field holding the command-specific return data (it
-can also be null).
-
-::
-
-    { "error": "success", "data": null }
-
-mpv will also send events to clients with JSON messages of the following form:
-
-::
-
-    { "event": "event_name" }
-
-where ``event_name`` is the name of the event. Additional event-specific fields
-can also be present. See `List of events`_ for a list of all supported events.
-
-Because events can occur at any time, it may be difficult at times to determine
-which response goes with which command. Commands may optionally include a
-``request_id`` which, if provided in the command request, will be copied
-verbatim into the response. mpv does not intrepret the ``request_id`` in any
-way; it is solely for the use of the requester.
-
-For example, this request:
-
-::
-
-    { "command": ["get_property", "time-pos"], "request_id": 100 }
-
-Would generate this response:
-
-::
-
-    { "error": "success", "data": 1.468135, "request_id": 100 }
-
-All commands, replies, and events are separated from each other with a line
-break character (``\n``).
-
-If the first character (after skipping whitespace) is not ``{``, the command
-will be interpreted as non-JSON text command, as they are used in input.conf
-(or ``mpv_command_string()`` in the client API). Additionally, lines starting
-with ``#`` and empty lines are ignored.
-
-Currently, embedded 0 bytes terminate the current line, but you should not
-rely on this.
-
-Commands
--------
-
-In addition to the commands described in `List of Input Commands`_, a few
-extra commands can also be used as part of the protocol:
-
-``client_name``
-    Return the name of the client as string. This is the string ``ipc-N`` with
-    N being an integer number.
-
-``get_time_us``
-    Return the current mpv internal time in microseconds as a number. This is
-    basically the system time, with an arbitrary offset.
-
-``get_property``
-    Return the value of the given property. The value will be sent in the data
-    field of the replay message.
-
-    Example:
-
-    ::
-
-        { "command": ["get_property", "volume"] }
-        { "data": 50.0, "error": "success" }
-
-``get_property_string``
-    Like ``get_property``, but the resulting data will always be a string.
-
-    Example:
-
-    ::
-
-        { "command": ["get_property_string", "volume"] }
-        { "data": "50.000000", "error": "success" }
-
-``set_property``
-    Set the given property to the given value. See `Properties`_ for more
-    information about properties.
-
-    Example:
-
-    ::
-
-        { "command": ["set_property", "pause", true] }
-        { "error": "success" }
-
-``set_property_string``
-    Like ``set_property``, but the argument value must be passed as string.
-
-    Example:
-
-    ::
-
-        { "command": ["set_property_string", "pause", "yes"] }
-        { "error": "success" }
-
-``observe_property``
-    Watch a property for changes. If the given property is changed, then an
-    event of type ``property-change`` will be generated
-
-    Example:
-
-    ::
-
-        { "command": ["observe_property", 1, "volume"] }
-        { "error": "success" }
-        { "event": "property-change", "id": 1, "data": 52.0, "name": "volume" }
-
-    .. warning::
-
-        If the connection is closed, the IPC client is destroyed internally,
-        and the observed properties are unregistered. This happens for example
-        when sending commands to a socket with separate ``socat`` invocations.
-        This can make it seem like property observation does not work. You must
-        keep the IPC connection open to make it work.
-
-``observe_property_string``
-    Like ``observe_property``, but the resulting data will always be a string.
-
-    Example:
-
-    ::
-
-        { "command": ["observe_property_string", 1, "volume"] }
-        { "error": "success" }
-        { "event": "property-change", "id": 1, "data": "52.000000", "name": "volume" }
-
-``unobserve_property``
-    Undo ``observe_property`` or ``observe_property_string``. This requires the
-    numeric id passed to the observed command as argument.
-
-    Example:
-
-    ::
-
-        { "command": ["unobserve_property", 1] }
-        { "error": "success" }
-
-``request_log_messages``
-    Enable output of mpv log messages. They will be received as events. The
-    parameter to this command is the log-level (see ``mpv_request_log_messages``
-    C API function).
-
-    Log message output is meant for humans only (mostly for debugging).
-    Attempting to retrieve information by parsing these messages will just
-    lead to breakages with future mpv releases. Instead, make a feature request,
-    and ask for a proper event that returns the information you need.
-
-``enable_event``, ``disable_event``
-    Enables or disables the named event. Mirrors the ``mpv_request_event`` C
-    API function. If the string ``all`` is used instead of an event name, all
-    events are enabled or disabled.
-
-    By default, most events are enabled, and there is not much use for this
-    command.
-
-``get_version``
-    Returns the client API version the C API of the remote mpv instance
-    provides.
-
-    See also: ``DOCS/client-api-changes.rst``.
-
-UTF-8
-----
-
-Normally, all strings are in UTF-8. Sometimes it can happen that strings are
-in some broken encoding (often happens with file tags and such, and filenames
-on many Unixes are not required to be in UTF-8 either). This means that mpv
-sometimes sends invalid JSON. If that is a problem for the client application's
-parser, it should filter the raw data for invalid UTF-8 sequences and perform
-the desired replacement, before feeding the data to its JSON parser.
-
-mpv will not attempt to construct invalid UTF-8 with broken escape sequences.
@@ -1,341 +0,0 @@
-JAVASCRIPT
-==========
-
-JavaScript support in mpv is near identical to its Lua support. Use this section
-as reference on differences and availability of APIs, but otherwise you should
-refer to the Lua documentation for API details and general scripting in mpv.
-
-Example
-------
-
-JavaScript code which leaves fullscreen mode when the player is paused:
-
-::
-
-    function on_pause_change(name, value) {
-        if (value == true)
-            mp.set_property("fullscreen", "no");
-    }
-    mp.observe_property("pause", "bool", on_pause_change);
-
-
-Similarities with Lua
---------------------
-
-mpv tries to load a script file as JavaScript if it has a ``.js`` extension, but
-otherwise, the documented Lua options, script directories, loading, etc apply to
-JavaScript files too.
-
-Script initialization and lifecycle is the same as with Lua, and most of the Lua
-functions at the modules ``mp``, ``mp.utils`` and ``mp.msg`` are available to
-JavaScript with identical APIs - including running commands, getting/setting
-properties, registering events/key-bindings/property-changes/hooks, etc.
-
-Differences from Lua
--------------------
-
-No need to load modules. ``mp``, ``mp.utils`` and ``mp.msg`` are preloaded, and
-you can use e.g. ``var cwd = mp.utils.getcwd();`` without prior setup.
-``mp.options`` is currently not implemented, but ``mp.get_opt(...)`` is.
-
-Errors are slightly different. Where the Lua APIs return ``nil`` for error,
-the JavaScript ones return ``undefined``. Where Lua returns ``something, error``
-JavaScript returns only ``something`` - and makes ``error`` available via
-``mp.last_error()``. Note that only some of the functions have this additional
-``error`` value - typically the same ones which have it in Lua.
-
-Standard APIs are preferred. For instance ``setTimeout`` and ``JSON.stringify``
-are available, but ``mp.add_timeout`` and ``mp.utils.format_json`` are not.
-
-No standard library. This means that interaction with anything outside of mpv is
-limited to the available APIs, typically via ``mp.utils``. However, some file
-functions were added, and CommonJS ``require`` is available too - where the
-loaded modules have the same privileges as normal scripts.
-
-Language features - ECMAScript 5
--------------------------------
-
-The scripting backend which mpv currently uses is MuJS - a compatible minimal
-ES5 interpreter. As such, ``String.substring`` is implemented for instance,
-while the common but non-standard ``String.substr`` is not. Please consult the
-MuJS pages on language features and platform support - http://mujs.com .
-
-Unsupported Lua APIs and their JS alternatives
----------------------------------------------
-
-``mp.add_timeout(seconds, fn)``  JS: ``id = setTimeout(fn, ms)``
-
-``mp.add_periodic_timer(seconds, fn)``  JS: ``id = setInterval(fn, ms)``
-
-``mp.register_idle(fn)``  JS: ``id = setTimeout(fn)``
-
-``mp.unregister_idle(fn)``  JS:  ``clearTimeout(id)``
-
-``utils.parse_json(str [, trail])``  JS: ``JSON.parse(str)``
-
-``utils.format_json(v)``  JS: ``JSON.stringify(v)``
-
-``utils.to_string(v)``  see ``dump`` below.
-
-``mp.suspend()`` JS: none (deprecated).
-
-``mp.resume()`` JS: none (deprecated).
-
-``mp.resume_all()`` JS: none (deprecated).
-
-``mp.get_next_timeout()`` see event loop below.
-
-``mp.dispatch_events([allow_wait])`` see event loop below.
-
-``mp.options`` module is not implemented currently for JS.
-
-Scripting APIs - identical to Lua
---------------------------------
-
-(LE) - Last-Error, indicates that ``mp.last_error()`` can be used after the
-call to test for success (empty string) or failure (non empty reason string).
-Otherwise, where the Lua APIs return ``nil`` on error, JS returns ``undefined``.
-
-``mp.command(string)`` (LE)
-
-``mp.commandv(arg1, arg2, ...)`` (LE)
-
-``mp.command_native(table [,def])`` (LE)
-
-``mp.get_property(name [,def])`` (LE)
-
-``mp.get_property_osd(name [,def])`` (LE)
-
-``mp.get_property_bool(name [,def])`` (LE)
-
-``mp.get_property_number(name [,def])`` (LE)
-
-``mp.get_property_native(name [,def])`` (LE)
-
-``mp.set_property(name, value)`` (LE)
-
-``mp.set_property_bool(name, value)`` (LE)
-
-``mp.set_property_number(name, value)`` (LE)
-
-``mp.set_property_native(name, value)`` (LE)
-
-``mp.get_time()``
-
-``mp.add_key_binding(key, name|fn [,fn [,flags]])``
-
-``mp.add_forced_key_binding(...)``
-
-``mp.remove_key_binding(name)``
-
-``mp.register_event(name, fn)``
-
-``mp.unregister_event(fn)``
-
-``mp.observe_property(name, type, fn)``
-
-``mp.unobserve_property(fn)``
-
-``mp.get_opt(key)``
-
-``mp.get_script_name()``
-
-``mp.osd_message(text [,duration])``
-
-``mp.get_wakeup_pipe()``
-
-``mp.enable_messages(level)``
-
-``mp.register_script_message(name, fn)``
-
-``mp.unregister_script_message(name)``
-
-``mp.msg.log(level, ...)``
-
-``mp.msg.fatal(...)``
-
-``mp.msg.error(...)``
-
-``mp.msg.warn(...)``
-
-``mp.msg.info(...)``
-
-``mp.msg.verbose(...)``
-
-``mp.msg.debug(...)``
-
-``mp.msg.trace(...)``
-
-``mp.utils.getcwd()`` (LE)
-
-``mp.utils.readdir(path [, filter])`` (LE)
-
-``mp.utils.file_info(path)`` (LE)
-
-``mp.utils.split_path(path)``
-
-``mp.utils.join_path(p1, p2)``
-
-``mp.utils.subprocess(t)``
-
-``mp.utils.subprocess_detached(t)``
-
-``mp.add_hook(type, priority, fn)``
-
-Additional utilities
--------------------
-
-``mp.last_error()``
-    If used after an API call which updates last error, returns an empty string
-    if the API call succeeded, or a non-empty error reason string otherwise.
-
-``Error.stack`` (string)
-    When using ``try { ... } catch(e) { ... }``, then ``e.stack`` is the stack
-    trace of the error - if it was created using the ``Error(...)`` constructor.
-
-``print`` (global)
-    A convenient alias to ``mp.msg.info``.
-
-``dump`` (global)
-    Like ``print`` but also expands objects and arrays recursively.
-
-``mp.utils.getenv(name)``
-    Returns the value of the host environment variable ``name``, or
-    ``undefined`` if the variable is not defined.
-
-``mp.utils.get_user_path(path)``
-    Expands (mpv) meta paths like ``~/x``, ``~~/y``, ``~~desktop/z`` etc.
-    ``read_file``, ``write_file`` and ``require`` already use this internaly.
-
-``mp.utils.read_file(fname [,max])``
-    Returns the content of file ``fname`` as string. If ``max`` is provided and
-    not negative, limit the read to ``max`` bytes.
-
-``mp.utils.write_file(fname, str)``
-    (Over)write file ``fname`` with text content ``str``. ``fname`` must be
-    prefixed with ``file://`` as simple protection against accidental arguments
-    switch, e.g. ``mp.utils.write_file("file://~/abc.txt", "hello world")``.
-
-Note: ``read_file`` and ``write_file`` throw on errors, allow text content only.
-
-``mp.get_time_ms()``
-    Same as ``mp.get_time()`` but in ms instead of seconds.
-
-``mp.get_script_file()``
-    Returns the file name of the current script.
-
-``exit()`` (global)
-    Make the script exit at the end of the current event loop iteration.
-    Note: please remove added key bindings before calling ``exit()``.
-
-``mp.utils.compile_js(fname, content_str)``
-    Compiles the JS code ``content_str`` as file name ``fname`` (without loading
-    anything from the filesystem), and returns it as a function. Very similar
-    to a ``Function`` constructor, but shows at stack traces as ``fname``.
-
-Timers (global)
---------------
-
-The standard HTML/node.js timers are available:
-
-``id = setTimeout(fn [,duration [,arg1 [,arg2...]]])``
-
-``id = setTimeout(code_string [,duration])``
-
-``clearTimeout(id)``
-
-``id = setInterval(fn [,duration [,arg1 [,arg2...]]])``
-
-``id = setInterval(code_string [,duration])``
-
-``clearInterval(id)``
-
-``setTimeout`` and ``setInterval`` return id, and later call ``fn`` (or execute
-``code_string``) after ``duration`` ms. Interval also repeat every ``duration``.
-
-``duration`` has a minimum and default value of 0, ``code_string`` is
-a plain string which is evaluated as JS code, and ``[,arg1 [,arg2..]]`` are used
-as arguments (if provided) when calling back ``fn``.
-
-The ``clear...(id)`` functions cancel timer ``id``, and are irreversible.
-
-Note: timers always call back asynchronously, e.g. ``setTimeout(fn)`` will never
-call ``fn`` before returning. ``fn`` will be called either at the end of this
-event loop iteration or at a later event loop iteration. This is true also for
-intervals - which also never call back twice at the same event loop iteration.
-
-Additionally, timers are processed after the event queue is empty, so it's valid
-to use ``setTimeout(fn)`` instead of Lua's ``mp.register_idle(fn)``.
-
-CommonJS modules and ``require(id)``
------------------------------------
-
-CommonJS Modules are a standard system where scripts can export common functions
-for use by other scripts. A module is a script which adds properties (functions,
-etc) to its invisible ``exports`` object, which another script can access by
-loading it with ``require(module-id)`` - which returns that ``exports`` object.
-
-Modules and ``require`` are supported, standard compliant, and generally similar
-to node.js. However, most node.js modules won't run due to missing modules such
-as ``fs``, ``process``, etc, but some node.js modules with minimal dependencies
-do work. In general, this is for mpv modules and not a node.js replacement.
-
-A ``.js`` file extension is always added to ``id``, e.g. ``require("./foo")``
-will load the file ``./foo.js`` and return its ``exports`` object.
-
-An id is relative (to the script which ``require``'d it) if it starts with
-``./`` or ``../``. Otherwise, it's considered a "top-level id" (CommonJS term).
-
-Top level id is evaluated as absolute filesystem path if possible (e.g. ``/x/y``
-or ``~/x``). Otherwise, it's searched at ``scripts/modules.js/`` in mpv config
-dirs - in normal config search order. E.g. ``require("x")`` is searched as file
-``x.js`` at those dirs, and id ``foo/x`` is searched as file ``foo/x.js``.
-
-No ``global`` variable, but a module's ``this`` at its top lexical scope is the
-global object - also in strict mode. If you have a module which needs ``global``
-as the global object, you could do ``this.global = this;`` before ``require``.
-
-Functions and variables declared at a module don't pollute the global object.
-
-The event loop
--------------
-
-The event loop poll/dispatch mpv events as long as the queue is not empty, then
-processes the timers, then waits for the next event, and repeats this forever.
-
-You could put this code at your script to replace the built-in event loop, and
-also print every event which mpv sends to your script:
-
-::
-
-    function mp_event_loop() {
-        var wait = 0;
-        do {
-            var e = mp.wait_event(wait);
-            dump(e);  // there could be a lot of prints...
-            if (e.event != "none") {
-                mp.dispatch_event(e);
-                wait = 0;
-            } else {
-                wait = mp.process_timers() / 1000;
-            }
-        } while (mp.keep_running);
-    }
-
-
-``mp_event_loop`` is a name which mpv tries to call after the script loads.
-The internal implementation is similar to this (without ``dump`` though..).
-
-``e = mp.wait_event(wait)`` returns when the next mpv event arrives, or after
-``wait`` seconds if positive and no mpv events arrived. ``wait`` value of 0
-returns immediately (with ``e.event == "none"`` if the queue is empty).
-
-``mp.dispatch_event(e)`` calls back the handlers registered for ``e.event``,
-if there are such (event handlers, property observers, script messages, etc).
-
-``mp.process_timers()`` calls back the already-added, non-canceled due timers,
-and returns the duration in ms till the next due timer (possibly 0), or -1 if
-there are no pending timers. Must not be called recursively.
-
-Note: ``exit()`` is also registered for the ``shutdown`` event, and its
-implementation is a simple ``mp.keep_running = false``.
@@ -1,75 +0,0 @@
-EMBEDDING INTO OTHER PROGRAMS (LIBMPV)
-======================================
-
-mpv can be embedded into other programs as video/audio playback backend. The
-recommended way to do so is using libmpv. See ``libmpv/client.h`` in the mpv
-source code repository. This provides a C API. Bindings for other languages
-might be available (see wiki).
-
-Since libmpv merely allows access to underlying mechanisms that can control
-mpv, further documentation is spread over a few places:
-
- https://github.com/mpv-player/mpv/blob/master/libmpv/client.h
- http://mpv.io/manual/master/#options
- http://mpv.io/manual/master/#list-of-input-commands
- http://mpv.io/manual/master/#properties
- https://github.com/mpv-player/mpv-examples/tree/master/libmpv
-
-C PLUGINS
-=========
-
-You can write C plugins for mpv. These use the libmpv API, although they do not
-use the libmpv library itself.
-
-Currently, they must be explicitly enabled at build time with
-``--enable-cplugins``. They are available on Linux/BSD platforms only.
-
-C plugins location
------------------
-
-C plugins are put into the mpv scripts directory in its config directory
-(see the `FILES`_ section for details). They must have a ``.so`` file extension.
-They can also be explicitly loaded with the ``--script`` option.
-
-API
---
-
-A C plugin must export the following function::
-
-    int mpv_open_cplugin(mpv_handle *handle)
-
-The plugin function will be called on loading time. This function does not
-return as long as your plugin is loaded (it runs in its own thread). The
-``handle`` will be deallocated as soon as the plugin function returns.
-
-The return value is interpreted as error status. A value of ``0`` is
-interpreted as success, while ``-1`` signals an error. In the latter case,
-the player prints an uninformative error message that loading failed.
-
-Return values other than ``0`` and ``-1`` are reserved, and trigger undefined
-behavior.
-
-Within the plugin function, you can call libmpv API functions. The ``handle``
-is created by ``mpv_create_client()`` (or actually an internal equivalent),
-and belongs to you. You can call ``mpv_wait_event()`` to wait for things
-happening, and so on.
-
-Note that the player might block until your plugin calls ``mpv_wait_event()``
-for the first time. This gives you a chance to install initial hooks etc.
-before playback begins.
-
-The details are quite similar to Lua scripts.
-
-Linkage to libmpv
-----------------
-
-The current implementation requires that your plugins are **not** linked against
-libmpv. What your plugins uses are not symbols from a libmpv binary, but
-symbols from the mpv host binary.
-
-Examples
--------
-
-See:
-
- https://github.com/mpv-player/mpv-examples/tree/master/cplugins
@@ -1,16 +1,10 @@
 LUA SCRIPTING
 =============

-mpv can load Lua scripts. Scripts passed to the ``--script`` option, or found in
-the ``scripts`` subdirectory of the mpv configuration directory (usually
-``~/.config/mpv/scripts/``) will be loaded on program start. mpv also appends the
-``scripts`` subdirectory to the end of Lua's path so you can import scripts from
-there too. Since it's added to the end, don't name scripts you want to import
-the same as Lua libraries because they will be overshadowed by them.
-
-mpv provides the built-in module ``mp``, which contains functions to send
-commands to the mpv core and to retrieve information about playback state, user
-settings, file information, and so on.
+mpv can load Lua scripts. Scripts in ``~/.mpv/lua/`` will be loaded on program
+start, or if passed to ``--lua``. mpv provides the builtin module ``mp``, which
+provides functions to send commands to the mpv core and to retrieve information
+about playback state, user settings, file information, and so on.

 These scripts can be used to control mpv in a similar way to slave mode.
 Technically, the Lua code uses the client API internally.
@@ -22,32 +16,29 @@ A script which leaves fullscreen mode when the player is paused:

 ::

-    function on_pause_change(name, value)
-        if value == true then
-            mp.set_property("fullscreen", "no")
-        end
+    function on_pause()
+        mp.set_property("fullscreen", "no")
    end
-    mp.observe_property("pause", "bool", on_pause_change)
+    mp.register_event("pause", on_pause)

+This script provides a pretty weird feature, but Lua scripting was made to
+allow users implement features which are not going to be added to the mpv core.

-Details on the script initialization and lifecycle
--------------------------------------------------
+Mode of operation
+-----------------

-Your script will be loaded by the player at program start from the ``scripts``
-configuration subdirectory, or from a path specified with the ``--script``
-option. Some scripts are loaded internally (like ``--osc``). Each script runs in
-its own thread. Your script is first run "as is", and once that is done, the event loop
-is entered. This event loop will dispatch events received by mpv and call your
-own event handlers which you have registered with ``mp.register_event``, or
-timers added with ``mp.add_timeout`` or similar. Note that since the
-script starts execution concurrently with player initialization, some properties
-may not be populated with meaningful values until the relevant subsystems have
-initialized.
+Your script will be loaded by the player at program start from ``~/.mpv/lua/``,
+or ``--lua``, or in some cases, internally (like ``--osc``). Each script runs
+in its own thread. Your script is first run "as is", and once that is done,
+the event loop is entered. This event loop will dispatch events received by mpv
+and call your own event handlers which you have registered with
+``mp.register_event``, or timers added with ``mp.add_timeout`` or similar.

 When the player quits, all scripts will be asked to terminate. This happens via
 a ``shutdown`` event, which by default will make the event loop return. If your
-script got into an endless loop, mpv will probably behave fine during playback,
-but it won't terminate when quitting, because it's waiting on your script.
+script got into an endless loop, mpv will probably behave fine during playback
+(unless the player is suspended, see ``mp.suspend``), but it won't terminate
+when quitting, because it's waiting on your script.

 Internally, the C code will call the Lua function ``mp_event_loop`` after
 loading a Lua script. This function is normally defined by the default prelude
@@ -56,15 +47,6 @@ The event loop will wait for events and dispatch events registered with
 ``mp.register_event``. It will also handle timers added with ``mp.add_timeout``
 and similar (by waiting with a timeout).

-Since mpv 0.6.0, the player will wait until the script is fully loaded before
-continuing normal operation. The player considers a script as fully loaded as
-soon as it starts waiting for mpv events (or it exits). In practice this means
-the player will more or less hang until the script returns from the main chunk
-(and ``mp_event_loop`` is called), or the script calls ``mp_event_loop`` or
-``mp.dispatch_events`` directly. This is done to make it possible for a script
-to fully setup event handlers etc. before playback actually starts. In older
-mpv versions, this happened asynchronously.
-
 mp functions
 ------------

@@ -75,10 +57,6 @@ The ``mp`` module is preloaded, although it can be loaded manually with
    Run the given command. This is similar to the commands used in input.conf.
    See `List of Input Commands`_.

-    By default, this will show something on the OSD (depending on the command),
-    as if it was used in ``input.conf``. See `Input Command Prefixes`_ how
-    to influence OSD usage per command.
-
    Returns ``true`` on success, or ``nil, error`` on error.

 ``mp.commandv(arg1, arg2, ...)``
@@ -96,22 +74,6 @@ The ``mp`` module is preloaded, although it can be loaded manually with
    These two commands are equivalent, except that the first version breaks
    if the filename contains spaces or certain special characters.

-    Note that properties are *not* expanded.  You can use either ``mp.command``,
-    the ``expand-properties`` prefix, or the ``mp.get_property`` family of
-    functions.
-
-    Unlike ``mp.command``, this will not use OSD by default either (except
-    for some OSD-specific commands).
-
-``mp.command_native(table [,def])``
-    Similar to ``mp.commandv``, but pass the argument list as table. This has
-    the advantage that in at least some cases, arguments can be passed as
-    native types.
-
-    Returns a result table on success (usually empty), or ``def, error`` on
-    error. ``def`` is the second parameter provided to the function, and is
-    nil if it's missing.
-
 ``mp.get_property(name [,def])``
    Return the value of the given property as string. These are the same
    properties as used in input.conf. See `Properties`_ for a list of
@@ -132,9 +94,9 @@ The ``mp`` module is preloaded, although it can be loaded manually with
    will always result in a string.

 ``mp.get_property_bool(name [,def])``
-    Similar to ``mp.get_property``, but return the property value as Boolean.
+    Similar to ``mp.get_property``, but return the property value as boolean.

-    Returns a Boolean on success, or ``def, error`` on error.
+    Returns a boolean on success, or ``def, error`` on error.

 ``mp.get_property_number(name [,def])``
    Similar to ``mp.get_property``, but return the property value as number.
@@ -147,7 +109,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with

 ``mp.get_property_native(name [,def])``
    Similar to ``mp.get_property``, but return the property value using the best
-    Lua type for the property. Most time, this will return a string, Boolean,
+    Lua type for the property. Most time, this will return a string, boolean,
    or number. Some properties (for example ``chapter-list``) are returned as
    tables.

@@ -162,7 +124,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with

 ``mp.set_property_bool(name, value)``
    Similar to ``mp.set_property``, but set the given property to the given
-    Boolean value.
+    boolean value.

 ``mp.set_property_number(name, value)``
    Similar to ``mp.set_property``, but set the given property to the given
@@ -177,7 +139,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
    Similar to ``mp.set_property``, but set the given property using its native
    type.

-    Since there are several data types which cannot represented natively in
+    Since there are several data types which can not represented natively in
    Lua, this might not always work as expected. For example, while the Lua
    wrapper can do some guesswork to decide whether a Lua table is an array
    or a map, this would fail with empty tables. Also, there are not many
@@ -190,41 +152,25 @@ The ``mp`` module is preloaded, although it can be loaded manually with
    Return the current mpv internal time in seconds as a number. This is
    basically the system time, with an arbitrary offset.

-``mp.add_key_binding(key, name|fn [,fn [,flags]])``
+``mp.add_key_binding(key, name|fn [,fn])``
    Register callback to be run on a key binding. The binding will be mapped to
    the given ``key``, which is a string describing the physical key. This uses
    the same key names as in input.conf, and also allows combinations
-    (e.g. ``ctrl+a``). If the key is empty or ``nil``, no physical key is
-    registered, but the user still can create own bindings (see below).
+    (e.g. ``ctrl+a``).

    After calling this function, key presses will cause the function ``fn`` to
-    be called (unless the user remapped the key with another binding).
+    be called (unless the user overmapped the key with another binding).

    The ``name`` argument should be a short symbolic string. It allows the user
-    to remap the key binding via input.conf using the ``script-message``
+    to remap the key binding via input.conf using the ``script_message``
    command, and the name of the key binding (see below for
    an example). The name should be unique across other bindings in the same
    script - if not, the previous binding with the same name will be
    overwritten. You can omit the name, in which case a random name is generated
    internally.

-    The last argument is used for optional flags. This is a table, which can
-    have the following entries:
-
-        ``repeatable``
-            If set to ``true``, enables key repeat for this specific binding.
-
-        ``complex``
-            If set to ``true``, then ``fn`` is called on both key up and down
-            events (as well as key repeat, if enabled), with the first
-            argument being a table. This table has an ``event`` entry, which
-            is set to one of the strings ``down``, ``repeat``, ``up`` or
-            ``press`` (the latter if key up/down can't be tracked). It further
-            has an ``is_mouse`` entry, which tells whether the event was caused
-            by a mouse button.
-
-    Internally, key bindings are dispatched via the ``script-message-to`` or
-    ``script-binding`` input commands and ``mp.register_script_message``.
+    Internally, key bindings are dispatched via the ``script_message_to`` input
+    command and ``mp.register_script_message``.

    Trying to map multiple commands to a key will essentially prefer a random
    binding, while the other bindings are not called. It is guaranteed that
@@ -243,26 +189,26 @@ The ``mp`` module is preloaded, although it can be loaded manually with
    This will print the message ``the key was pressed`` when ``x`` was pressed.

    The user can remap these key bindings. Then the user has to put the
-    following into their input.conf to remap the command to the ``y`` key:
+    following into his input.conf to remap the command to the ``y`` key:

    ::

-        y script-binding something
+        y script_message something


    This will print the message when the key ``y`` is pressed. (``x`` will
-    still work, unless the user remaps it.)
+    still work, unless the user overmaps it.)

    You can also explicitly send a message to a named script only. Assume the
    above script was using the filename ``fooscript.lua``:

    ::

-        y script-binding fooscript/something
+        y script_message_to fooscript something

 ``mp.add_forced_key_binding(...)``
    This works almost the same as ``mp.add_key_binding``, but registers the
-    key binding in a way that will overwrite the user's custom bindings in their
+    key binding in a way that will overwrite the user's custom bindings in his
    input.conf. (``mp.add_key_binding`` overwrites default key bindings only,
    but not those by the user's input.conf.)

@@ -336,6 +282,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
    the timer is re-added after the function fn is run.

    Returns a timer object. The timer object provides the following methods:
+
        ``stop()``
            Disable the timer. Does nothing if the timer is already disabled.
            This will remember the current elapsed time when stopping, so that
@@ -352,51 +299,16 @@ The ``mp`` module is preloaded, although it can be loaded manually with
            with ``add_timeout()``), this starts the timer from the beginning,
            using the initially configured timeout.

-        ``is_enabled()``
-            Whether the timer is currently enabled or was previously disabled
-            (e.g. by ``stop()`` or ``kill()``).
-
-        ``timeout`` (RW)
-            This field contains the current timeout period. This value is not
-            updated as time progresses. It's only used to calculate when the
-            timer should fire next when the timer expires.
-
-            If you write this, you can call ``t:kill() ; t:resume()`` to reset
-            the current timeout to the new one. (``t:stop()`` won't use the
-            new timeout.)
-
-        ``oneshot`` (RW)
-            Whether the timer is periodic (``false``) or fires just once
-            (``true``). This value is used when the timer expires (but before
-            the timer callback function fn is run).
-
-    Note that these are method, and you have to call them using ``:`` instead
-    of ``.`` (Refer to http://www.lua.org/manual/5.2/manual.html#3.4.9 .)
-
-    Example:
-
-    ::
-
-        seconds = 0
-        timer = mp.add_periodic_timer(1, function()
-            print("called every second")
-            # stop it after 10 seconds
-            seconds = seconds + 1
-            if seconds >= 10 then
-                timer:kill()
-            end
-        end)
-

 ``mp.get_opt(key)``
-    Return a setting from the ``--script-opts`` option. It's up to the user and
+    Return a setting from the ``--lua-opts`` option. It's up to the user and
    the script how this mechanism is used. Currently, all scripts can access
    this equally, so you should be careful about collisions.

 ``mp.get_script_name()``
    Return the name of the current script. The name is usually made of the
    filename of the script, with directory and file extension removed. If
-    there are several scripts which would have the same name, it's made unique
+    there are several script which would have the same name, it's made unique
    by appending a number.

    .. admonition:: Example
@@ -414,16 +326,25 @@ These also live in the ``mp`` module, but are documented separately as they
 are useful only in special situations.

 ``mp.suspend()``
-    This function has been deprecated in mpv 0.21.0 and does nothing starting
-    with mpv 0.23.0 (no replacement).
+    Suspend the mpv main loop. There is a long-winded explanation of this in
+    the C API function ``mpv_suspend()``. In short, this prevents the player
+    from displaying the next video frame, so that you don't get blocked when
+    trying to access the player.
+
+    This is automatically called by the event handler.

 ``mp.resume()``
-    This function has been deprecated in mpv 0.21.0 and does nothing starting
-    with mpv 0.23.0 (no replacement).
+    Undo one ``mp.suspend()`` call. ``mp.suspend()`` increments an internal
+    counter, and ``mp.resume()`` decrements it. When 0 is reached, the player
+    is actually resumed.

 ``mp.resume_all()``
-    This function has been deprecated in mpv 0.21.0 and does nothing starting
-    with mpv 0.23.0 (no replacement).
+    This resets the internal suspend counter and resumes the player. (It's
+    like calling ``mp.resume()`` until the player is actually resumed.)
+
+    You might want to call this if you're about to do something that takes a
+    long time, but doesn't really need access to the player (like a network
+    operation). Note that you still can access the player at any time.

 ``mp.get_wakeup_pipe()``
    Calls ``mpv_get_wakeup_pipe()`` and returns the read end of the wakeup
@@ -438,7 +359,7 @@ are useful only in special situations.
    control what the Lua script does (instead of being called by the default
    event loop), you can set the global variable ``mp_event_loop`` to your
    own function running the event loop. From your event loop, you should call
-    ``mp.dispatch_events()`` to dequeue and dispatch mpv events.
+    ``mp.dispatch_events()`` to unqueue and dispatch mpv events.

    If the ``allow_wait`` parameter is set to ``true``, the function will block
    until the next event is received or the next timer expires. Otherwise (and
@@ -447,17 +368,7 @@ are useful only in special situations.
    ``mp.get_wakeup_pipe()`` if you're interested in properly working
    notification of new events and working timers.

-``mp.register_idle(fn)``
-    Register an event loop idle handler. Idle handlers are called before the
-    script goes to sleep after handling all new events. This can be used for
-    example to delay processing of property change events: if you're observing
-    multiple properties at once, you might not want to act on each property
-    change, but only when all change notifications have been received.
-
-``mp.unregister_idle(fn)``
-    Undo ``mp.register_idle(fn)``. This removes all idle handlers that
-    are equal to the ``fn`` parameter. This uses normal Lua ``==`` comparison,
-    so be careful when dealing with closures.
+    This function calls ``mp.suspend()`` and ``mp.resume_all()`` on its own.

 ``mp.enable_messages(level)``
    Set the minimum log level of which mpv message output to receive. These
@@ -467,9 +378,9 @@ are useful only in special situations.
    The level is a string, see ``msg.log`` for allowed log levels.

 ``mp.register_script_message(name, fn)``
-    This is a helper to dispatch ``script-message`` or ``script-message-to``
-    invocations to Lua functions. ``fn`` is called if ``script-message`` or
-    ``script-message-to`` (with this script as destination) is run
+    This is a helper to dispatch ``script_message`` or ``script_message_to``
+    invocations to Lua functions. ``fn`` is called if ``script_message`` or
+    ``script_message_to`` (with this script as destination) is run
    with ``name`` as first parameter. The other parameters are passed to ``fn``.
    If a message with the given name is already registered, it's overwritten.

@@ -487,17 +398,16 @@ with ``require 'mp.msg'``.

 ``msg.log(level, ...)``
    The level parameter is the message priority. It's a string and one of
-    ``fatal``, ``error``, ``warn``, ``info``, ``v``, ``debug``, ``trace``. The
-    user's settings will determine which of these messages will be
-    visible. Normally, all messages are visible, except ``v``, ``debug`` and
-    ``trace``.
+    ``fatal``, ``error``, ``warn``, ``info``, ``v``, ``debug``. The user's
+    settings will determine which of these messages will be visible. Normally,
+    all messages are visible, except ``v`` and ``debug``.

    The parameters after that are all converted to strings. Spaces are inserted
    to separate multiple parameters.

    You don't need to add newlines.

-``msg.fatal(...)``, ``msg.error(...)``, ``msg.warn(...)``, ``msg.info(...)``, ``msg.verbose(...)``, ``msg.debug(...)``, ``msg.trace(...)``
+``msg.fatal(...)``, ``msg.error(...)``, ``msg.warn(...)``, ``msg.info(...)``, ``msg.verbose(...)``, ``msg.debug(...)``
    All of these are shortcuts and equivalent to the corresponding
    ``msg.log(level, ...)`` call.

@@ -527,8 +437,8 @@ Example implementation::
        optionB = -0.5,
        optionC = true,
    }
-    read_options(options, "myscript")
-    print(options.optionA)
+    options.read_options(options, "myscript")
+    print(option.optionA)


 The config file will be stored in ``lua-settings/identifier.conf`` in mpv's user
@@ -543,28 +453,21 @@ Example config::
    optionC=no


-Command-line options are read from the ``--script-opts`` parameter. To avoid
+Command-line options are read from the ``--lua-opts`` parameter. To avoid
 collisions, all keys have to be prefixed with ``identifier-``.

 Example command-line::

-     --script-opts=myscript-optionA=TEST,myscript-optionB=0,myscript-optionC=yes
+     --lua-opts=myscript-optionA=TEST:myscript-optionB=0:myscript-optionC=yes


-mp.utils functions
------------------
+mp.utils options
+----------------

 This built-in module provides generic helper functions for Lua, and have
 strictly speaking nothing to do with mpv or video/audio playback. They are
 provided for convenience. Most compensate for Lua's scarce standard library.

-Be warned that any of these functions might disappear any time. They are not
-strictly part of the guaranteed API.
-
-``utils.getcwd()``
-    Returns the directory that mpv was launched from. On error, ``nil, error``
-    is returned.
-
 ``utils.readdir(path [, filter])``
    Enumerate all entries at the given path on the filesystem, and return them
    as array. Each entry is a directory entry (without the path).
@@ -592,34 +495,6 @@ strictly part of the guaranteed API.

    On error, ``nil, error`` is returned.

-``utils.file_info(path)``
-    Stats the given path for information and returns a table with the
-    following entries:
-
-        ``mode``
-            protection bits (on Windows, always 755 (octal) for directories
-            and 644 (octal) for files)
-        ``size``
-            size in bytes
-        ``atime``
-            time of last access
-        ``mtime``
-            time of last modification
-        ``ctime``
-            time of last metadata change (Linux) / time of creation (Windows)
-        ``is_file``
-            Whether ``path`` is a regular file (boolean)
-        ``is_dir``
-            Whether ``path`` is a directory (boolean)
-
-    ``mode`` and ``size`` are integers.
-    Timestamps (``atime``, ``mtime`` and ``ctime``) are integer seconds since
-    the Unix epoch (Unix time).
-    The booleans ``is_file`` and ``is_dir`` are provided as a convenience;
-    they can be and are derived from ``mode``.
-
-    On error (eg. path does not exist), ``nil, error`` is returned.
-
 ``utils.split_path(path)``
    Split a path into directory component and filename component, and return
    them. The first return value is always the directory. The second return
@@ -629,85 +504,6 @@ strictly part of the guaranteed API.
    Return the concatenation of the 2 paths. Tries to be clever. For example,
    if ```p2`` is an absolute path, p2 is returned without change.

-``utils.subprocess(t)``
-    Runs an external process and waits until it exits. Returns process status
-    and the captured output.
-
-    The parameter ``t`` is a table. The function reads the following entries:
-
-        ``args``
-            Array of strings. The first array entry is the executable. This
-            can be either an absolute path, or a filename with no path
-            components, in which case the ``PATH`` environment variable is
-            used to resolve the executable. The other array elements are
-            passed as command line arguments.
-
-        ``cancellable``
-            Optional. If set to ``true`` (default), then if the user stops
-            playback or goes to the next file while the process is running,
-            the process will be killed.
-
-        ``max_size``
-            Optional. The maximum size in bytes of the data that can be captured
-            from stdout. (Default: 16 MB.)
-
-    The function returns a table as result with the following entries:
-
-        ``status``
-            The raw exit status of the process. It will be negative on error.
-
-        ``stdout``
-            Captured output stream as string, limited to ``max_size``.
-
-        ``error``
-            ``nil`` on success. The string ``killed`` if the process was
-            terminated in an unusual way. The string ``init`` if the process
-            could not be started.
-
-            On Windows, ``killed`` is only returned when the process has been
-            killed by mpv as a result of ``cancellable`` being set to ``true``.
-
-        ``killed_by_us``
-            Set to ``true`` if the process has been killed by mpv as a result
-            of ``cancellable`` being set to ``true``.
-
-``utils.subprocess_detached(t)``
-    Runs an external process and detaches it from mpv's control.
-
-    The parameter ``t`` is a table. The function reads the following entries:
-
-        ``args``
-            Array of strings of the same semantics as the ``args`` used in the
-            ``subprocess`` function.
-
-    The function returns ``nil``.
-
-``utils.parse_json(str [, trail])``
-    Parses the given string argument as JSON, and returns it as a Lua table. On
-    error, returns ``nil, error``. (Currently, ``error`` is just a string
-    reading ``error``, because there is no fine-grained error reporting of any
-    kind.)
-
-    The returned value uses similar conventions as ``mp.get_property_native()``
-    to distinguish empty objects and arrays.
-
-    If the ``trail`` parameter is ``true`` (or any value equal to ``true``),
-    then trailing non-whitespace text is tolerated by the function, and the
-    trailing text is returned as 3rd return value. (The 3rd return value is
-    always there, but with ``trail`` set, no error is raised.)
-
-``utils.format_json(v)``
-    Format the given Lua table (or value) as a JSON string and return it. On
-    error, returns ``nil, error``. (Errors usually only happen on value types
-    incompatible with JSON.)
-
-    The argument value uses similar conventions as ``mp.set_property_native()``
-    to distinguish empty objects and arrays.
-
-``utils.to_string(v)``
-    Turn the given value into a string. Formats tables and their contents. This
-    doesn't do anything special; it is only needed because Lua is terrible.
-
 Events
 ------

@@ -725,7 +521,7 @@ Example:
        print("start of playback!")
    end

-    mp.register_event("file-loaded", my_fn)
+    mp.register_event("playback-start", my_fn)



@@ -740,49 +536,37 @@ List of events
    Happens after a file was unloaded. Typically, the player will load the
    next file right away, or quit if this was the last file.

-    The event has the ``reason`` field, which takes one of these values:
-
-    ``eof``
-        The file has ended. This can (but doesn't have to) include
-        incomplete files or broken network connections under
-        circumstances.
-
-    ``stop``
-        Playback was ended by a command.
-
-    ``quit``
-        Playback was ended by sending the quit command.
-
-    ``error``
-        An error happened. In this case, an ``error`` field is present with
-        the error string.
-
-    ``redirect``
-        Happens with playlists and similar. Details see
-        ``MPV_END_FILE_REASON_REDIRECT`` in the C API.
-
-    ``unknown``
-        Unknown. Normally doesn't happen, unless the Lua API is out of sync
-        with the C API. (Likewise, it could happen that your script gets
-        reason strings that did not exist yet at the time your script was
-        written.)
-
 ``file-loaded``
    Happens after a file was loaded and begins playback.

 ``seek``
-    Happens on seeking. (This might include cases when the player seeks
-    internally, even without user interaction. This includes e.g. segment
-    changes when playing ordered chapters Matroska files.)
+    Happens on seeking (including ordered chapter segment changes).

 ``playback-restart``
    Start of playback after seek or after file was loaded.

+``tracks-changed``
+    The list of video/audio/sub tracks was updated. (This happens on playback
+    start, and very rarely during playback.)
+
+``track-switched``
+    A video/audio/subtitle track was switched on or off. This usually happens
+    when the user (or a script) changes the subtitle track and so on.
+
 ``idle``
    Idle mode is entered. This happens when playback ended, and the player was
    started with ``--idle`` or ``--force-window``. This mode is implicitly ended
    when the ``start-file`` or ``shutdown`` events happen.

+``pause``
+    Playback was paused. This also happens when for example the player is
+    paused on low network cache. Then the event type indicates the pause state
+    (like the property "pause" as opposed to the "core-idle" property), and you
+    might receive multiple ``pause`` events in a row.
+
+``unpause``
+    Playback was unpaused. See above for details.
+
 ``tick``
    Called after a video frame was displayed. This is a hack, and you should
    avoid using it. Use timers instead and maybe watch pausing/unpausing events
@@ -790,7 +574,7 @@ List of events

 ``shutdown``
    Sent when the player quits, and the script should terminate. Normally
-    handled automatically. See `Details on the script initialization and lifecycle`_.
+    handled automatically. See `Mode of operation`_.

 ``log-message``
    Receives messages enabled with ``mp.enable_messages``. The message data
@@ -809,8 +593,13 @@ List of events
        (undocumented) existing ones.

    ``text``
-        The log message. The text will end with a newline character. Sometimes
-        it can contain multiple lines.
+        The log message. Note that this is the direct output of a printf()
+        style output API. The text will contain embedded newlines, and it's
+        possible that a single message contains multiple lines, or that a
+        message contains a partial line.
+
+        It's safe to display messages only if they end with a newline character,
+        and to buffer them otherwise.

    Keep in mind that these messages are meant to be hints for humans. You
    should not parse them, and prefix/level/text of messages might change
@@ -825,6 +614,9 @@ List of events
 ``command-reply``
    Undocumented (not useful for Lua scripts).

+``script-input-dispatch``
+    Undocumented (used internally).
+
 ``client-message``
    Undocumented (used internally).

@@ -834,25 +626,8 @@ List of events
 ``audio-reconfig``
    Happens on audio output or filter reconfig.

-The following events also happen, but are deprecated: ``tracks-changed``,
-``track-switched``, ``pause``, ``unpause``, ``metadata-update``,
-``chapter-change``. Use ``mp.observe_property()`` instead.
+``metadata-update``
+    Metadata (like file tags) was updated.

-Extras
------
-
-This documents experimental features, or features that are "too special" to
-guarantee a stable interface.
-
-``mp.add_hook(type, priority, fn)``
-    Add a hook callback for ``type`` (a string identifying a certain kind of
-    hook). These hooks allow the player to call script functions and wait for
-    their result (normally, the Lua scripting interface is asynchronous from
-    the point of view of the player core). ``priority`` is an arbitrary integer
-    that allows ordering among hooks of the same kind. Using the value 50 is
-    recommended as neutral default value. ``fn`` is the function that will be
-    called during execution of the hook.
-
-    See `Hooks`_ for currently existing hooks and what they do - only the hook
-    list is interesting; handling hook execution is done by the Lua script
-    function automatically.
+``chapter-change``
+    The current chapter possibly changed.
@@ -5,7 +5,7 @@ The On Screen Controller (short: OSC) is a minimal GUI integrated with mpv to
 offer basic mouse-controllability. It is intended to make interaction easier
 for new users and to enable precise and direct seeking.

-The OSC is enabled by default if mpv was compiled with Lua support. It can be
+The OSC is enabled by default if mpv was compiled with lua support. It can be
 disabled entirely using the ``--osc=no`` option.

 Using the OSC
@@ -20,77 +20,37 @@ The Interface

 ::

-    +---------+----------+------------------------------------------+----------+
-    | pl prev | pl next  |  title                                   |    cache |
-    +------+--+---+------+---------+-----------+------+-------+-----+-----+----+
-    | play | skip | skip | time    |  seekbar  | time | audio | sub | vol | fs |
-    |      | back | frwd | elapsed |           | left |       |     |     |    |
-    +------+------+------+---------+-----------+------+-------+-----+-----+----+
+    +------------------+-----------+--------------------+
+    | playlist prev    |   title   |      playlist next |
+    +-------+------+---+--+------+-+----+------+--------+
+    | audio | skip | seek |      | seek | skip |  full  |
+    +-------+ back | back | play | frwd | frwd | screen |
+    | sub   |      |      |      |      |      |        |
+    +-------+------+------+------+------+------+--------+
+    |                     seekbar                       |
+    +----------------+--------------+-------------------+
+    | time passed    | cache status |    time remaining |
+    +----------------+--------------+-------------------+


-pl prev
+playlist prev
    =============   ================================================
    left-click      play previous file in playlist
-    right-click     show playlist
-    shift+L-click   show playlist
-    =============   ================================================
-
-pl next
-    =============   ================================================
-    left-click      play next file in playlist
-    right-click     show playlist
    shift+L-click   show playlist
    =============   ================================================

 title
-    | Displays current media-title, filename, or custom title
+    | Displays current media-title or filename

    =============   ================================================
    left-click      show playlist position and length and full title
    right-click     show filename
    =============   ================================================

-cache
-    | Shows current cache fill status
-
-play
+playlist next
    =============   ================================================
-    left-click      toggle play/pause
-    =============   ================================================
-
-skip back
-    =============   ================================================
-    left-click      go to beginning of chapter / previous chapter
-    right-click     show chapters
-    shift+L-click   show chapters
-    =============   ================================================
-
-skip frwd
-    =============   ================================================
-    left-click      go to next chapter
-    right-click     show chapters
-    shift+L-click   show chapters
-    =============   ================================================
-
-time elapsed
-    | Shows current playback position timestamp
-
-    =============   ================================================
-    left-click      toggle displaying timecodes with milliseconds
-    =============   ================================================
-
-seekbar
-    | Indicates current playback position and position of chapters
-
-    =============   ================================================
-    left-click      seek to position
-    =============   ================================================
-
-time left
-    | Shows remaining playback time timestamp
-
-    =============   ================================================
-    left-click      toggle between total and remaining time
+    left-click      play next file in playlist
+    shift+L-click   show playlist
    =============   ================================================

 audio and sub
@@ -102,26 +62,75 @@ audio and sub
    shift+L-click   show available audio/sub tracks
    =============   ================================================

-vol
+skip back
    =============   ================================================
-    left-click      toggle mute
-    mouse wheel     volume up/down
+    left-click      go to beginning of chapter / previous chapter
+    shift+L-click   show chapters
    =============   ================================================

-fs
+seek back
+    =============   ================================================
+    left-click      skip back  5 seconds
+    right-click     skip back 30 seconds
+    shift-L-click   skip back  1 frame
+    =============   ================================================
+
+play
+    =============   ================================================
+    left-click      toggle play/pause
+    =============   ================================================
+
+seek frwd
+    =============   ================================================
+    left-click      skip forward 10 seconds
+    right-click     skip forward 60 seconds
+    shift-L-click   skip forward  1 frame
+    =============   ================================================
+
+skip frwd
+    =============   ================================================
+    left-click      go to next chapter
+    shift+L-click   show chapters
+    =============   ================================================
+
+fullscreen
    =============   ================================================
    left-click      toggle fullscreen
    =============   ================================================

-Key Bindings
-~~~~~~~~~~~~
+seekbar
+    | Indicates current playback position and position of chapters

-These key bindings are active by default if nothing else is already bound to
-these keys. In case of collision, the function needs to be bound to a
-different key. See the `Script Commands`_ section.
+    =============   ================================================
+    left-click      seek to position
+    =============   ================================================
+
+time passed
+    | Shows current playback position timestamp
+
+    =============   ================================================
+    left-click      toggle displaying timecodes with milliseconds
+    =============   ================================================
+
+cache status
+    | Shows current cache fill status (only visible when below 45%)
+
+time remaining
+    | Shows remaining playback time timestamp
+
+    =============   ================================================
+    left-click      toggle between total and remaining time
+    =============   ================================================
+
+Keybindings
+~~~~~~~~~~~
+
+These keybindings are active by default if nothing else is already bound to
+these keys. In case of collosision, the function needs to be bound to a
+different key. See `Script Commands`_ section.

 =============   ================================================
-del             Cycles visibility between never / auto (mouse-move) / always
+del             Hide the OSC permanently until mpv is restarted.
 =============   ================================================

 Configuration
@@ -129,7 +138,7 @@ Configuration

 The OSC offers limited configuration through a config file
 ``lua-settings/osc.conf`` placed in mpv's user dir and through the
-``--script-opts`` command-line option. Options provided through the command-line
+``--lua-opts`` command-line option. Options provided through the command-line
 will override those from the config file.

 Config Syntax
@@ -152,138 +161,73 @@ To avoid collisions with other scripts, all options need to be prefixed with

 Example::

-    --script-opts=osc-optionA=value1,osc-optionB=value2
+    --lua-opts=osc-optionA=value1:osc-optionB=value2


 Configurable Options
 ~~~~~~~~~~~~~~~~~~~~

-``layout``
-    Default: bottombar
-
-    The layout for the OSC. Currently available are: box, slimbox,
-    bottombar and topbar. Default pre-0.21.0 was 'box'.
-
-``seekbarstyle``
-    Default: bar
-
-    Sets the style of the seekbar, slider (diamond marker), knob (circle
-    marker with guide), or bar (fill).
-    Default pre-0.21.0 was 'slider'.
-
-``deadzonesize``
-    Default: 0.5
-
-    Size of the deadzone. The deadzone is an area that makes the mouse act
-    like leaving the window. Movement there won't make the OSC show up and
-    it will hide immediately if the mouse enters it. The deadzone starts
-    at the window border opposite to the OSC and the size controls how much
-    of the window it will span. Values between 0.0 and 1.0, where 0 means the
-    OSC will always popup with mouse movement in the window, and 1 means the
-    OSC will only show up when the mouse hovers it. Default pre-0.21.0 was 0.
-
-``minmousemove``
-    Default: 0
-
-    Minimum amount of pixels the mouse has to move between ticks to make
-    the OSC show up. Default pre-0.21.0 was 3.
-
 ``showwindowed``
-    Default: yes
-
-    Enable the OSC when windowed
+    | Default: yes
+    | Show OSC when windowed?

 ``showfullscreen``
-    Default: yes
-
-    Enable the OSC when fullscreen
+    | Default: yes
+    | Show OSC when fullscreen?

 ``scalewindowed``
-    Default: 1.0
-
-    Scale factor of the OSC when windowed.
+    | Default: 1
+    | Scaling of the controller when windowed

 ``scalefullscreen``
-    Default: 1.0
-
-    Scale factor of the OSC when fullscreen
+    | Default: 1
+    | Scaling of the controller when fullscreen

 ``scaleforcedwindow``
-    Default: 2.0
-
-    Scale factor of the OSC when rendered on a forced (dummy) window
+    | Default: 2
+    | Scaling of the controller when rendered on a forced (dummy) window

 ``vidscale``
-    Default: yes
-
-    Scale the OSC with the video
-    ``no`` tries to keep the OSC size constant as much as the window size allows
+    | Default: yes
+    | Scale the controller with the video?

 ``valign``
-    Default: 0.8
-
-    Vertical alignment, -1 (top) to 1 (bottom)
+    | Default: 0.8
+    | Vertical alignment, -1 (top) to 1 (bottom)

 ``halign``
-    Default: 0.0
-
-    Horizontal alignment, -1 (left) to 1 (right)
-
-``barmargin``
-    Default: 0
-
-    Margin from bottom (bottombar) or top (topbar), in pixels
+    | Default: 0
+    | Horizontal alignment, -1 (left) to 1 (right)

 ``boxalpha``
-    Default: 80
-
-    Alpha of the background box, 0 (opaque) to 255 (fully transparent)
+    | Default: 80
+    | Alpha of the background box, 0 (opaque) to 255 (fully transparent)

 ``hidetimeout``
-    Default: 500
-
-    Duration in ms until the OSC hides if no mouse movement, must not be
-    negative
+    | Default: 500
+    | Duration in ms until the OSC hides if no mouse movement, negative value
+      disables auto-hide

 ``fadeduration``
-    Default: 200
+    | Default: 200
+    | Duration of fade out in ms, 0 = no fade

-    Duration of fade out in ms, 0 = no fade
+``deadzonesize``
+    | Default: 0
+    | Size of the deadzone. The deadzone is an area that makes the mouse act
+      like leaving the window. Movement there won't make the OSC show up and
+      it will hide immediately if the mouse enters it. The deadzone starts
+      at the window border opposite to the OSC and the size controls how much
+      of the window it will span. Values between 0 and 1.

-``title``
-    Default: ${media-title}
+``minmousemove``
+    | Default: 3
+    | Minimum amount of pixels the mouse has to move between ticks to make
+      the OSC show up

-    String that supports property expansion that will be displayed as
-    OSC title.
-    ASS tags are escaped, and newlines and trailing slashes are stripped.
-
-``tooltipborder``
-    Default: 1
-
-    Size of the tooltip outline when using bottombar or topbar layouts
-
-``timetotal``
-    Default: no
-
-    Show total time instead of time remaining
-
-``timems``
-    Default: no
-
-    Display timecodes with milliseconds
-
-``visibility``
-    Default: auto (auto hide/show on mouse move)
-
-    Also supports ``never`` and ``always``
-
-``boxmaxchars``
-    Default: 80
-
-    Max chars for the osc title at the box layout. mpv does not measure the
-    text width on screen and so it needs to limit it by number of chars. The
-    default is conservative to allow wide fonts to be used without overflow.
-    However, with many common fonts a bigger number can be used. YMMV.
+``seektooltip``
+    | Default: yes
+    | Display a tooltip over the seekbar indicating time at mouse position.

 Script Commands
 ~~~~~~~~~~~~~~~
@@ -291,23 +235,18 @@ Script Commands
 The OSC script listens to certain script commands. These commands can bound
 in ``input.conf``, or sent by other scripts.

-``osc-message``
-    Show a message on screen using the OSC. First argument is the message,
-    second the duration in seconds.
+``enable-osc``
+    Undoes ``disable-osc`` or the effect of the ``del`` key.
+
+``disable-osc``
+    Hide the OSC permanently. This is also what the ``del`` key does.

-``osc-visibility``
-    Controls visibility mode ``never`` / ``auto`` (on mouse move) / ``always``
-    and also ``cycle`` to cycle between the modes

 Example

 You could put this into ``input.conf`` to hide the OSC with the ``a`` key and
-to set auto mode (the default) with ``b``::
+to unhide it with ``b``::

-    a script-message osc-visibility never
-    b script-message osc-visibility auto
-
-``osc-playlist``, ``osc-chapterlist``, ``osc-tracklist``
-    Shows a limited view of the respective type of list using the OSC. First
-    argument is duration in seconds.
+    a script_message disable-osc
+    b script_message enable-osc

@@ -1,162 +0,0 @@
-STATS
-=====
-
-This builtin script displays information and statistics for the currently
-played file. It is enabled by default if mpv was compiled with Lua support.
-It can be disabled entirely using the ``--load-stats-overlay=no`` option.
-
-Usage
-----
-
-The following key bindings are active by default unless something else is
-already bound to them:
-
-====   ==============================================
-i      Show stats for a fixed duration
-I      Toggle stats (shown until toggled again)
-====   ==============================================
-
-While the stats are visible on screen the following key bindings are active,
-regardless of existing bindings. They allow you to switch between *pages* of
-stats:
-
-====   ==================
-1      Show usual stats
-2      Show frame timings
-====   ==================
-
-Font
-~~~~
-
-For optimal visual experience, a font with support for many font weights and
-monospaced digits is recommended. By default, the open source font
-`Source Sans Pro <https://github.com/adobe-fonts/source-sans-pro>`_ is used.
-
-Configuration
-------------
-
-This script can be customized through a config file ``lua-settings/stats.conf``
-placed in mpv's user directory and through the ``--script-opts`` command-line
-option. The configuration syntax is described in `ON SCREEN CONTROLLER`_.
-
-Configurable Options
-~~~~~~~~~~~~~~~~~~~~
-
-``key_oneshot``
-    Default: i
-``key_toggle``
-    Default: I
-
-    Key bindings to display stats.
-
-``key_page_1``
-    Default: 1
-``key_page_2``
-    Default: 2
-
-    Key bindings for page switching while stats are displayed.
-
-``duration``
-    Default: 4
-
-    How long the stats are shown in seconds (oneshot).
-
-``redraw_delay``
-    Default: 1
-
-    How long it takes to refresh the displayed stats in seconds (toggling).
-
-``persistent_overlay``
-    Default: no
-
-    When `no`, other scripts printing text to the screen can overwrite the
-    displayed stats. When `yes`, displayed stats are persistently shown for the
-    respective duration. This can result in overlapping text when multiple
-    scripts decide to print text at the same time.
-
-``plot_perfdata``
-    Default: yes
-
-    Show graphs for performance data (page 2).
-
-``plot_vsync_ratio``
-    Default: yes
-``plot_vsync_jitter``
-    Default: yes
-
-    Show graphs for vsync and jitter values (page 1). Only when toggled.
-
-``flush_graph_data``
-    Default: yes
-
-    Clear data buffers used for drawing graphs when toggling.
-
-``font``
-    Default: Source Sans Pro
-
-    Font name. Should support as many font weights as possible for optimal
-    visual experience.
-
-``font_mono``
-    Default: Source Sans Pro
-
-    Font name for parts where monospaced characters are necessary to align
-    text. Currently, monospaced digits are sufficient.
-
-``font_size``
-    Default: 8
-
-    Font size used to render text.
-
-``font_color``
-    Default: FFFFFF
-
-    Font color.
-
-``border_size``
-    Default: 0.8
-
-    Size of border drawn around the font.
-
-``border_color``
-    Default: 262626
-
-    Color of drawn border.
-
-``alpha``
-    Default: 11
-
-    Transparency for drawn text.
-
-``plot_bg_border_color``
-    Default: 0000FF
-
-    Border color used for drawing graphs.
-
-``plot_bg_color``
-    Default: 262626
-
-    Background color used for drawing graphs.
-
-``plot_color``
-    Default: FFFFFF
-
-    Color used for drawing graphs.
-
-Note: colors are given as hexadecimal values and use ASS tag order: BBGGRR
-(blue green red).
-
-Different key bindings
-~~~~~~~~~~~~~~~~~~~~~~
-
-A different key binding can be defined with the aforementioned options
-``key_oneshot`` and ``key_toggle`` but also with commands in ``input.conf``,
-for example::
-
-    e script-binding stats/display-stats
-    E script-binding stats/display-stats-toggle
-
-Using ``input.conf``, it is also possible to directly display a certain page::
-
-    i script-binding stats/display-page-1
-    e script-binding stats/display-page-2
@@ -1,456 +0,0 @@
-CHANGES FROM OTHER VERSIONS OF MPLAYER
-======================================
-
-**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, a
-large part of which is incompatible or completely changes how the player
-behaves. Although there are still many similarities to its ancestors, **mpv**
-should generally be treated as a completely different program.
-
-.. admonition:: Warning
-
-    This document is **not updated** anymore, and is **incomplete** and
-    **outdated**. If you look for old option replacements, always check with
-    the current mpv manpage, as the options could have changed meanwhile.
-
-General Changes from MPlayer to mpv
-----------------------------------
-
-This listing is about changes introduced by mplayer2 and mpv relatively to
-MPlayer.
-
-Player
-~~~~~~
-
-* New name for the binary (``mpv``). New location for config files (either
-  ``~/.config/mpv/mpv.conf``, or if you want, ``~/.mpv/config``).
-* Encoding functionality (replacement for MEncoder, see the `ENCODING`_ section).
-* Support for Lua scripting (see the `LUA SCRIPTING`_ section).
-* Better pause handling (e.g. do not unpause on a command).
-* Precise seeking support.
-* Improvements in audio/video sync handling.
-* Do not lose settings when playing a new file in the same player instance.
-* Slave mode compatibility broken (see below).
-* Re-enable screensaver while the player is paused.
-* Allow resuming playback at a later point with ``Shift+q``, also see the
-  ``quit-watch-later`` input command.
-* ``--keep-open`` option to stop the player from closing the window and
-  exiting after playback ends.
-* A client API, that allows embedding **mpv** into applications
-  (see ``libmpv/client.h`` in the sources).
-
-Input
-~~~~~
-
-* Improved default keybindings. MPlayer bindings are also available (see
-  ``etc/mplayer-input.conf`` in the source tree).
-* Improved responsiveness on user input.
-* Support for modifier keys (alt, shift, ctrl) in input.conf.
-* Allow customizing whether a key binding for seeking shows the video time, the
-  OSD bar, or nothing (see the `Input Command Prefixes`_ section).
-* Support mapping multiple commands to one key.
-* Classic LIRC support was removed. Install remotes as input devices instead.
-  This way they will send X11 key events to the mpv window, which can be bound
-  using the normal ``input.conf``.
-  Also see: http://github.com/mpv-player/mpv/wiki/IR-remotes
-* Joystick support was removed. It was considered useless and was the cause
-  of some problems (e.g. a laptop's accelerator being recognized as joystick).
-* Support for relative seeking by percentage.
-
-Audio
-~~~~~
-
-* Support for gapless audio (see the ``--gapless-audio`` option).
-* Support for OSS4 volume control.
-* Improved support for PulseAudio.
-* Make ``--softvol`` default (**mpv** is not a mixer control panel).
-* By default, do pitch correction if playback speed is increased.
-* Improved downmixing and output of surround audio:
-
-  - Instead of using hardcoded pan filters to do remixing, libavresample is used
-  - Channel maps are used to identify the channel layout, so e.g. ``3.0`` and
-    ``2.1`` audio can be distinguished.
-
-Video
-~~~~~
-
-* Wayland support.
-* Native support for VAAPI and VDA. Improved VDPAU video output.
-* Improved GPU-accelerated video output (see the ``gpu-hq`` preset).
-* Make hardware decoding work with the ``gpu`` video output.
-* Support for libavfilter (for video->video and audio->audio). This allows
-  using most of FFmpeg's filters, which improve greatly on the old MPlayer
-  filters in features, performance, and correctness.
-* More correct color reproduction (color matrix generation), including support
-  for BT.2020 (Ultra HD). linear XYZ (Digital Cinema) and SMPTE ST2084 (HDR)
-  inputs.
-* Support for color managed displays, via ICC profiles.
-* High-quality image resamplers (see the ``--scale`` suboption).
-* Support for scaling in (sigmoidized) linear light.
-* Better subtitle rendering using libass by default.
-* Improvements when playing multiple files (``-fixed-vo`` is default, do not
-  reset settings by default when playing a new file).
-* Replace image video outputs (``--vo=jpeg`` etc.) with ``--vo=image``.
-* Removal of ``--vo=gif89a``, ``--vo=md5sum``, ``--vo=yuv4mpeg``, as encoding
-  can handle these use cases. For yuv4mpeg, for example, use::
-
-    mpv input.mkv -o output.y4m --no-audio --oautofps --oneverdrop
-
-* Image subtitles (DVDs etc.) are rendered in color and use more correct
-  positioning (color for image subs can be disabled with ``--sub-gray``).
-* Support for the X11 video output is removed, since it was considered
-  deprecated. SDL video output can still be used as a fallback.
-
-OSD and terminal
-~~~~~~~~~~~~~~~~
-
-* Cleaned up terminal output: nicer status line, less useless noise.
-* Improved OSD rendering using libass, with full Unicode support.
-* New OSD bar with chapter marks. Not positioned in the middle of the video
-  (this can be customized with the ``--osd-bar-align-y`` option).
-* Display list of chapters and audio/subtitle tracks on OSD (see the
-  `Properties`_ section).
-
-Screenshots
-~~~~~~~~~~~
-
-* Instant screenshots without 1-frame delay.
-* Support for taking screenshots even with hardware decoding.
-* Support for saving screenshots as JPEG or PNG.
-* Support for configurable file names.
-* Support for taking screenshots with or without subtitles.
-
-Note that the ``screenshot`` video filter is not needed anymore, and should not
-be put into the mpv config file.
-
-Miscellaneous
-~~~~~~~~~~~~~
-
-* Better MKV support (e.g. ordered chapters, 3D metadata).
-* Matroska edition switching at runtime.
-* Support for playing URLs of popular streaming sites directly.
-  (e.g. ``mpv https://www.youtube.com/watch?v=...``).
-  Requires a recent version of ``youtube-dl`` to be installed. Can be
-  disabled with ``ytdl=no`` in the mpv config file.
-* Support for precise scrolling which scales the parameter of commands. If the
-  input doesn't support precise scrolling the scale factor stays 1.
-* Allow changing/adjusting video filters at runtime. (This is also used to make
-  the ``D`` key insert vf_yadif if deinterlacing is not supported otherwise).
-* Improved support for .cue files.
-
-Mac OS X
-~~~~~~~~
-
-* Native OpenGL backend.
-* Cocoa event loop is independent from MPlayer's event loop, so user
-  actions like accessing menus and live resizing do not block the playback.
-* Apple Remote support.
-* Media Keys support.
-* VDA support using libavcodec hwaccel API instead of FFmpeg's decoder with up
-  to 2-2.5x reduction in CPU usage.
-
-Windows
-~~~~~~~
-
-* Improved support for Unicode file names.
-* Improved window handling.
-* Do not block playback when moving the window.
-* Improved Direct3D video output.
-* Added WASAPI audio output.
-
-Internal changes
-~~~~~~~~~~~~~~~~
-
-* Switch to GPLv2+ (see ``Copyright`` file for details).
-* Removal of lots of cruft:
-
-  - Internal GUI (replaced by the OSC, see the `ON SCREEN CONTROLLER`_ section).
-  - MEncoder (replaced by native encoding, see the `ENCODING`_ section).
-  - OSD menu.
-  - Kernel video drivers for Linux 2.4 (including VIDIX).
-  - Teletext support.
-  - Support for dead platforms.
-  - Most built-in demuxers have been replaced by their libavformat counterparts.
-  - Built-in network support has been replaced by libavformat's (which also
-    supports https URLs).
-  - Embedded copies of libraries (such as FFmpeg).
-
-* General code cleanups (including refactoring or rewrites of many parts).
-* New build system.
-* Many bug fixes and removal of long-standing issues.
-* Generally preferring FFmpeg/Libav over internal demuxers, decoders, and
-  filters.
-
-Detailed Listing of User-visible Changes
----------------------------------------
-
-This listing is about changed command line switches, slave commands, and similar
-things. Completely removed features are not listed.
-
-Command Line Switches
-~~~~~~~~~~~~~~~~~~~~~
-
-* There is a new command line syntax, which is generally preferred over the old
-  syntax. ``-optname optvalue`` becomes ``--optname=optvalue``.
-
-  The old syntax will not be removed. However, the new syntax is mentioned in
-  all documentation and so on, and unlike the old syntax is not ambiguous,
-  so it is a good thing to know about this change.
-* In general, negating switches like ``-noopt`` now have to be written as
-  ``-no-opt`` or ``--no-opt``.
-* Per-file options are not the default anymore. You can explicitly specify
-  file-local options. See ``Usage`` section.
-* Many options have been renamed, removed or changed semantics. Some options
-  that are required for a good playback experience with MPlayer are now
-  superfluous or even worse than the defaults, so make sure to read the manual
-  before trying to use your existing configuration with **mpv**.
-* Table of renamed/replaced switches:
-
-    =========================== ========================================
-    Old                         New
-    =========================== ========================================
-    ``-no<opt>``                ``--no-<opt>`` (add a dash)
-    ``-a52drc level``           ``--ad-lavc-ac3drc=level``
-    ``-ac spdifac3``            ``--ad=spdif:ac3`` (see ``--ad=help``)
-    ``-af volnorm``             (removed; use acompressor ffmpeg filter instead)
-    ``-afm hwac3``              ``--ad=spdif:ac3,spdif:dts``
-    ``-ao alsa:device=hw=0.3``  ``--ao=alsa:device=[hw:0,3]``
-    ``-aspect``                 ``--video-aspect``
-    ``-ass-bottom-margin``      ``--vf=sub=bottom:top``
-    ``-ass``                    ``--sub-ass``
-    ``-audiofile-cache``        (removed; the main cache settings are used)
-    ``-audiofile``              ``--audio-file``
-    ``-benchmark``              ``--untimed`` (no stats)
-    ``-capture``                ``--stream-capture=<filename>``
-    ``-channels``               ``--audio-channels`` (changed semantics)
-    ``-cursor-autohide-delay``  ``--cursor-autohide``
-    ``-delay``                  ``--audio-delay``
-    ``-dumpstream``             ``--stream-dump=<filename>``
-    ``-dvdangle``               ``--dvd-angle``
-    ``-endpos``                 ``--length``
-    ``-fixed-vo``               (removed; always the default)
-    ``-font``                   ``--osd-font``
-    ``-forcedsubsonly``         ``--sub-forced-only``
-    ``-forceidx``               ``--index``
-    ``-format``                 ``--audio-format``
-    ``-fsmode-dontuse``         (removed)
-    ``-fstype``                 ``--x11-netwm`` (changed semantics)
-    ``-hardframedrop``          ``--framedrop=hard``
-    ``-identify``               (removed; use TOOLS/mpv_identify.sh)
-    ``-idx``                    ``--index``
-    ``-lavdopts ...``           ``--vd-lavc-...``
-    ``-lavfdopts``              ``--demuxer-lavf-...``
-    ``-loop 0``                 ``--loop=inf``
-    ``-mixer-channel``          AO suboptions (``alsa``, ``oss``)
-    ``-mixer``                  AO suboptions (``alsa``, ``oss``)
-    ``-mouse-movements``        ``--input-cursor``
-    ``-msgcolor``               ``--msg-color``
-    ``-msglevel``               ``--msg-level`` (changed semantics)
-    ``-msgmodule``              ``--msg-module``
-    ``-name``                   ``--x11-name``
-    ``-noar``                   ``--no-input-appleremote``
-    ``-noautosub``              ``--no-sub-auto``
-    ``-noconsolecontrols``      ``--no-input-terminal``
-    ``-nosound``                ``--no-audio``
-    ``-osdlevel``               ``--osd-level``
-    ``-panscanrange``           ``--video-zoom``, ``--video-pan-x/y``
-    ``-playing-msg``            ``--term-playing-msg``
-    ``-pp ...``                 ``'--vf=lavfi=[pp=...]'``
-    ``-pphelp``                 (See FFmpeg libavfilter documentation.)
-    ``-rawaudio ...``           ``--demuxer-rawaudio-...``
-    ``-rawvideo ...``           ``--demuxer-rawvideo-...``
-    ``-spugauss``               ``--sub-gauss``
-    ``-srate``                  ``--audio-samplerate``
-    ``-ss``                     ``--start``
-    ``-ssf <sub>``              ``--sws-...``
-    ``-stop-xscreensaver``      ``--stop-screensaver``
-    ``-sub-fuzziness``          ``--sub-auto``
-    ``-sub-text-*``             ``--sub-*``
-    ``-sub``                    ``--sub-file``
-    ``-subcp``                  ``--sub-codepage``
-    ``-subdelay``               ``--sub-delay``
-    ``-subfile``                ``--sub-file``
-    ``-subfont-*``              ``--sub-*``, ``--osd-*``
-    ``-subfont-text-scale``     ``--sub-scale``
-    ``-subfont``                ``--sub-font``
-    ``-subfps``                 ``--sub-fps``
-    ``-subpos``                 ``--sub-pos``
-    ``-sws``                    ``--sws-scaler``
-    ``-tvscan``                 ``--tv-scan``
-    ``-use-filename-title``     ``--title='${filename}'``
-    ``-vc ffh264vdpau`` (etc.)  ``--hwdec=vdpau``
-    ``-vobsub``                 ``--sub-file`` (pass the .idx file)
-    ``-x W``, ``-y H``          ``--geometry=WxH`` + ``--no-keepaspect``
-    ``-xineramascreen``         ``--screen`` (different values)
-    ``-xy W``                   ``--autofit=W``
-    ``-zoom``                   Inverse available as ``--video-unscaled``
-    ``dvdnav://``               Removed.
-    ``dvd://1``                 ``dvd://0`` (0-based offset)
-    =========================== ========================================
-
-.. note::
-
-    ``-opt val`` becomes ``--opt=val``.
-
-.. note::
-
-    Quite some video filters, video outputs, audio filters, audio outputs, had
-    changes in their option parsing. These aren't mentioned in the table above.
-
-    Also, some video and audio filters have been removed, and you have to use
-    libavfilter (using ``--vf=lavfi=[...]`` or ``--af=lavfi=[...]``) to get
-    them back.
-
-input.conf and Slave Commands
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* 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, a warning will be printed when starting the player. The warnings
-    also show the replacement commands.
-
-    Properties containing ``_`` to separate words use ``-`` instead.
-
-    +--------------------------------+----------------------------------------+
-    | Old                            | New                                    |
-    +================================+========================================+
-    | ``pt_step 1 [0|1]``            | ``playlist-next [weak|force]``         |
-    |                                | (translation layer cannot deal with    |
-    |                                | whitespace)                            |
-    +--------------------------------+----------------------------------------+
-    | ``pt_step -1 [0|1]``           | ``playlist-prev [weak|force] (same)``  |
-    +--------------------------------+----------------------------------------+
-    | ``switch_ratio [<ratio>]``     | ``set video-aspect <ratio>``           |
-    |                                |                                        |
-    |                                | ``set video-aspect 0`` (reset aspect)  |
-    +--------------------------------+----------------------------------------+
-    | ``step_property_osd <prop>``   | ``cycle <prop> <step>`` (wraps),       |
-    | ``<step> <dir>``               | ``add <prop> <step>`` (clamps).        |
-    |                                | ``<dir>`` parameter unsupported. Use   |
-    |                                | a negative ``<step>`` instead.         |
-    +--------------------------------+----------------------------------------+
-    | ``step_property <prop>``       | Prefix ``cycle`` or ``add`` with       |
-    | ``<step> <dir>``               | ``no-osd``: ``no-osd cycle <prop>``    |
-    |                                | ``<step>``                             |
-    +--------------------------------+----------------------------------------+
-    | ``osd_show_property_text``     | ``show-text <text>``                   |
-    | ``<text>``                     | The property expansion format string   |
-    |                                | syntax slightly changed.               |
-    +--------------------------------+----------------------------------------+
-    | ``osd_show_text``              | Now does the same as                   |
-    |                                | ``osd_show_property_text``. Use the    |
-    |                                | ``raw`` prefix to disable property     |
-    |                                | expansion.                             |
-    +--------------------------------+----------------------------------------+
-    | ``show_tracks``                | ``show-text ${track-list}``            |
-    +--------------------------------+----------------------------------------+
-    | ``show_chapters``              | ``show-text ${chapter-list}``          |
-    +--------------------------------+----------------------------------------+
-    | ``af_switch``, ``af_add``, ... | ``af set|add|...``                     |
-    +--------------------------------+----------------------------------------+
-    | ``tv_start_scan``              | ``set tv-scan yes``                    |
-    +--------------------------------+----------------------------------------+
-    | ``tv_set_channel <val>``       | ``set tv-channel <val>``               |
-    +--------------------------------+----------------------------------------+
-    | ``tv_step_channel``            | ``cycle tv-channel``                   |
-    +--------------------------------+----------------------------------------+
-    | ``dvb_set_channel <v1> <v2>``  | ``set dvb-channel <v1>-<v2>``          |
-    +--------------------------------+----------------------------------------+
-    | ``dvb_step_channel``           | ``cycle dvb-channel``                  |
-    +--------------------------------+----------------------------------------+
-    | ``tv_set_freq <val>``          | ``set tv-freq <val>``                  |
-    +--------------------------------+----------------------------------------+
-    | ``tv_step_freq``               | ``cycle tv-freq``                      |
-    +--------------------------------+----------------------------------------+
-    | ``tv_set_norm <norm>``         | ``set tv-norm <norm>``                 |
-    +--------------------------------+----------------------------------------+
-    | ``tv_step_norm``               | ``cycle tv-norm``                      |
-    +--------------------------------+----------------------------------------+
-
-    .. note::
-
-        Due to lack of hardware and users using the TV/DVB/PVR features, and
-        due to the need to cleanup the related command code, it's possible
-        that the new commands are buggy or behave worse. This can be improved
-        if testers are available. Otherwise, some of the TV code will be
-        removed at some point.
-
-Slave mode
-~~~~~~~~~~
-
-* Slave mode was removed. A proper slave mode application needed tons of code
-  and hacks to get
-  it right. The main problem is that slave mode is a bad and incomplete
-  interface, and to get around that, applications parsed output messages
-  intended for users. It is hard to know which messages exactly are parsed by
-  slave mode applications. This makes it virtually impossible to improve
-  terminal output intended for users without possibly breaking something.
-
-  This is absolutely insane, and since initial improvements to **mpv** quickly
-  made slave mode incompatible to most applications, it was removed as useless
-  cruft. The client API (see below) is provided instead.
-
-  ``--identify`` was replaced by the ``TOOLS/mpv_identify.sh`` wrapper script.
-
-* For some time (until including release 0.4.x), mpv supported a
-  ``--slave-broken`` option. The following options are equivalent:
-
-  ::
-
-        --input-file=/dev/stdin --input-terminal=no
-
-
-  Assuming the system supports ``/dev/stdin``.
-
-  (The option was added back in 0.5.1 and sets exactly these options. It was
-  removed in 0.10.x again.)
-
-* A JSON RPC protocol giving access to the client API is also supported. See
-  `JSON IPC`_ for more information.
-
-* **mpv** also provides a client API, which can be used to embed the player
-  by loading it as shared library. (See ``libmpv/client.h`` in the sources.)
-  It might also be possible to implement a custom slave mode-like protocol
-  using Lua scripting.
-
-Policy for Removed Features
---------------------------
-
-**mpv** is in active development. If something is in the way of more important
-development (such as fixing bugs or implementing new features), we sometimes
-remove features. Usually this happens only with old features that either seem
-to be useless, or are not used by anyone. Often these are obscure, or
-"inherited", or were marked experimental, but never received any particular
-praise by any users.
-
-Sometimes, features are replaced by something new. The new code will be either
-simpler or more powerful, but doesn't necessarily provide everything the old
-feature did.
-
-We can not exclude that we accidentally remove features that are actually
-popular. Generally, we do not know how much a specific functionality is used.
-If you miss a feature and think it should be re-added, please open an issue
-on the mpv bug tracker. Hopefully, a solution can be found. Often, it turns
-out that re-adding something is not much of a problem, or that there are
-better alternatives.
-
-Why this Fork?
--------------
-
-mplayer2 is practically dead, and mpv started out as a branch containing
-new/experimental development. (Some of it was merged right *after* the fork
-was made public, seemingly as an acknowledgment that development, or at
-least merging, should have been more active.)
-
-MPlayer is focused on not breaking anything, but is stuck with a horrible
-codebase resistant to cleanup. (Unless you do what mpv did - merciless and
-consequent pruning of bad, old code.) Cleanup and keeping broken things
-conflict, so the kind of development mpv strives for can't be done within
-MPlayer due to clashing development policies.
-
-Additionally, mplayer2 already had lots of changes over MPlayer, which would
-have needed to be backported to the MPlayer codebase. This would not only
-have been hard (several years of diverging development), but also would have
-been impossible due to the aforementioned MPlayer development policy.
@@ -1,117 +1,57 @@
 Release Policy
 ==============

-Once or twice a month, a new release is cut off of the master branch and is
-assigned a 0.X.Y version number, where X is incremented each time a release
-contains breaking changes, such as changed options or added/removed features,
-and Y is incremented if a release contains only bugfixes and other minor
-changes.
+Every few months, a new release is cut off of the master branch and is assigned
+a 0.X.0 version number.

-Releases are tagged on the master branch and will not be maintained separately.
+As part of the maintenance process, minor releases are made, which are assigned
+0.X.Y version numbers. Minor releases contain bug fixes only. They never merge
+the master branch, and no features are added to it. Only the latest release is
+maintained.

-The goal of releases is to provide Linux distributions with something to
-package. If you want the newest features, just use the master branch.
-We try our best to keep it deployable at all times.
+The goal of releases is to provide stability and an unchanged base for the sake
+of Linux distributions. If you want the newest features, just use the master
+branch, which is stable most of the time, except sometimes, when it's not.

 Releases other than the latest release are unsupported and unmaintained.

 Release procedure
 -----------------

-While on master:
+- Create branch release/0.X or cherry-pick commits to the relevant branch.

- Update the `RELEASE_NOTES` file.
+- Create and/or update the ``RELEASE_NOTES`` file.

- Update the `VERSION` file.
+- Create and/or update the ``VERSION`` file.

- Update `DOCS/client-api-changes.rst` and `DOCS/interface-changes.rst`
-  (in particular, update the last version numbers if necessary)
+- Create tag v0.X.Y.

- Commit changes.
+- Push branch and tag to GitHub.

- Create signed tag v0.X.Y.
-
- Add -UNKNOWN suffix to version in `VERSION` file.
-
- Commit changes, push branch and tag to GitHub.
-
- Create a new GitHub release using the content of `RELEASE_NOTES` related to
-  the new version.
+- Create a new GitHub release using the content of ``RELEASE_NOTES``.

 Release notes template
 ----------------------

-Here is a template that can be used for writing the `RELEASE_NOTES` file.
+Here is a template that can be used for writing the ``RELEASE_NOTES`` file.

 ```markdown
-Release 0.X.Y
-=============
+Changes
+-------

-Features
--------
+- List of changes.

-New
-~~~
+Bug fixes
+---------

- List of new features
+- List of bug fixes.

-Removed
-~~~~~~~
+New features
+------------

- List of removed features
-
-Deprecated
-~~~~~~~~~~
-
- List of deprecated features
-
-Behavior
--------
-
- List of user-visible changes in behavior
-
-Options and Commands
--------------------
-
-Added
-~~~~~
-
- List of added options and commands
-
-Changed
-~~~~~~~
-
- List of changed options and commands
-
-Renamed
-~~~~~~~
-
- List of renamed options and commands
-
-Deprecated
-~~~~~~~~~~
-
- List of deprecated options and commands
-
-Removed
-~~~~~~~
-
- List of removed options and commands
-
-Fixes and Minor Enhancements
----------------------------
-
- List of fixes and minor enhancements
+- List of new features.

 This listing is not complete. There are many more bug fixes and changes. The
-complete change log can be viewed by running `git log <start>..<end>` in
+complete change log can be viewed by running ``git log <start>..<end>`` in
 the git repository.
 ```
-
-Note that the "Release 0.X.Y" title should be removed when creating a new GitHub
-release.
-
-When creating a new point release its changes should be added on top of the
-`RELEASE_NOTES` file (with the appropriate title) so that all the changes in
-the current 0.X branch will be included. This way the `RELEASE_NOTES` file
-can be used by distributors as changelog for point releases too.
@@ -1,4 +1,4 @@
-This file intends to give a big picture overview of how mpv is structured.
+This file intends to give a big picture of how mpv is structured.

 player/*.c:
    Essentially makes up the player applications, including the main() function
@@ -17,12 +17,12 @@ player/*.c:
        * check help options etc. (call handle_help_options()), possibly exit
        * call play_files() function that works down the playlist:
            * run idle loop (idle_loop()), until there are files in the
-                playlist or an exit command was given (only if --idle it set)
+                playlist or an exit command was given (slave mode only)
            * actually load and play a file in play_current_file():
                * run all the dozens of functions to load the file and
                  initialize playback
                * run a small loop that does normal playback, until the file is
-                  done or a command terminates playback
+                  done or a slave command terminates playback
                  (on each iteration, run_playloop() is called, which is rather
                   big and complicated - it decodes some audio and video on
                   each frame, waits for input, etc.)
@@ -31,41 +31,39 @@ player/*.c:
            * loop, or exit if no next file or quit is requested
              (see enum stop_play_reason)
        * call exit_player_with_rc()
-    * run_playloop():
-        * calls fill_audio_out_buffers()
-            This checks whether new audio needs to be decoded, and pushes it
-            to the AO.
-        * calls write_video()
-            Decode new video, and push it to the VO.
-        * determines whether playback of the current file has ended
-        * determines when to start playback after seeks
-        * and calls a whole lot of other stuff
-            (Really, this function does everything.)

    Things worth saying about the playback core:
-    - most state is in MPContext (core.h), which is not available to the
+    - the currently played tracks are in sh_video and sh_audio
+    - the timeline stuff is used only with MKV ordered chapters (and some other
+      minor features: cue, edl)
+    - most state is in MPContext (mp_core.h), which is not available to the
      subsystems
-    - the currently played tracks are in mpctx->current_tracks, and decoder
-      state in track.d_video/d_audio/d_sub
    - the other subsystems rarely call back into the frontend, and the frontend
      polls them instead (probably a good thing)
-    - one exceptions are wakeup callbacks, which notify a "higher" component
-      of a changed situation in a subsystem

    I like to call the player/*.c files the "frontend".

-ta.h & ta.c:
-    Hierarchical memory manager inspired by talloc from Samba. It's like a
-    malloc() with more features. Most importantly, each talloc allocation can
-    have a parent, and if the parent is free'd, all children will be free'd as
-    well. The parent is an arbitrary talloc allocation. It's either set by the
-    allocation call by passing a talloc parent, usually as first argument to the
-    allocation function. It can also be set or reset later by other calls (at
-    least talloc_steal()). A talloc allocation that is used as parent is often
-    called a talloc context.
+talloc.h & talloc.c:
+    Hierarchical memory manager copied from Samba. It's like a malloc() with
+    more features. Most importantly, each talloc allocation can have a parent,
+    and if the parent is free'd, all children will be free'd as well. The
+    parent is an arbitrary talloc allocation. It's either set by the allocation
+    call by passing a talloc parent, usually as first argument to the allocation
+    function. It can also be set or reset later by other calls (at least
+    talloc_steal()). A talloc allocation that is used as parent is often called
+    a talloc context.
+
+    Lots of code still uses malloc() proper, and you should be careful what
+    type of allocation you're dealing with when returning or free'ing an
+    allocation. (Needless to say, talloc_free() and free() are completely
+    different things.)
+
+    The copy in mpv has been modified to abort on OOM conditions. An
+    allocation call will never return NULL.

    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 setting the
+    as in it doesn't require valgrind.) You can enable it by passing the option
+    --leak-report as first parameter, or better, setting the
    MPV_LEAK_REPORT environment variable to "1":
        export MPV_LEAK_REPORT=1
    This will list all unfree'd allocations on exit.
@@ -73,16 +71,18 @@ ta.h & ta.c:
    Documentation can be found here:
        http://git.samba.org/?p=samba.git;a=blob;f=lib/talloc/talloc.h;hb=HEAD

-    For some reason, we're still using API-compatible wrappers instead of TA
-    directly. The talloc wrapper has only a subset of the functionality, and
-    in particular the wrappers abort() on memory allocation failure.
-
    Note: unlike tcmalloc, jemalloc, etc., talloc() is not actually a malloc
          replacement. It works on top of system malloc and provides additional
          features that are supposed to make memory management easier.

+    Warning: actually, we're not using talloc anymore. talloc in mpv has been
+             replaced by a custom re-implementation (TA in ta/). It provides
+             some talloc emulation (just the parts needed by mpv). We will get
+             rid of the talloc emulation later and use TA natively.
+             (See ta/README for details.)
+
 player/command.c:
-    This contains the implementation for client API commands and properties.
+    This contains the implementation for slave commands and properties.
    Properties are essentially dynamic variables changed by certain commands.
    This is basically responsible for all user commands, like initiating
    seeking, switching tracks, etc. It calls into other player/*.c files,
@@ -92,10 +92,9 @@ player/core.h:
    Data structures and function prototypes for most of player/*.c. They are
    usually not accessed by other parts of mpv for the sake of modularization.

-player/client.c:
-    This implements the client API (libmpv/client.h). For the most part, this
-    just calls into other parts of the player. This also manages a ringbuffer
-    of events from player to clients.
+    Note that there are lots of global variables floating around everywhere
+    else. This is an ongoing transition, and eventually there should be no
+    global variables anymore.

 options/options.h, options/options.c
    options.h contains the global option struct MPOpts. The option declarations
@@ -103,26 +102,27 @@ options/options.h, options/options.c
    options.c. Most default values for options and MPOpts are in
    mp_default_opts at the end of options.c.

-    MPOpts is unfortunately quite monolithic, and virtually accessed by
+    MPOpts is unfortunarely quite monolithic, and virtually accessed by
    everything.But some components (like video outputs and video filters) have
    their own sub-option tables separate from MPOpts.

    The actual option parser is spread over m_option.c, m_config.c, and
-    parse_commandline.c, and uses the option table in options.c.
+    parser-mpcmd.c, and uses the option table in options.c.

 input/input.c:
-    This translates keyboard input coming from VOs and other sources (such
-    as remote control devices like Apple IR or client API commands) to the
+    This translates keyboard input comming from libvo and other sources (such
+    as remote control devices like Apple IR or slave mode commands) to the
    key bindings listed in the user's (or the builtin) input.conf and turns
    them into items of type struct mp_cmd. These commands are queued, and read
    by playloop.c. They get pushed with run_command() to command.c.

-    Note that keyboard input and commands used by the client API are the same.
-    The client API only uses the command parser though, and has its own queue
-    of input commands somewhere else.
+    Note that keyboard input and slave mode input are essentially the same
+    things. Just looking at input.conf should make this clear. (The other
+    direction of slave mode communication, mpv to application, consists of
+    random mp_msg() calls all over the code in all parts of the player.)

 common/msg.h:
-    All terminal output must go through mp_msg().
+    All terminal output should go through mp_msg().

 stream/*:
    File input is implemented here. stream.h/.c provides a simple stream based
@@ -149,7 +149,8 @@ demux/:

    Most demuxers have been removed from this fork, and the only important and
    "actual" demuxers left are demux_mkv.c and demux_lavf.c (uses libavformat).
-    There are some pseudo demuxers like demux_cue.c.
+    There are some pseudo demuxers like demux_cue.c, which exist only to invoke
+    other frontend code (tl_cue.c in this case).

    The main interface is in demux.h. The stream headers are in stheader.h.
    There is a stream header for each audio/video/sub stream, and each of them
@@ -163,8 +164,8 @@ video/:
    internally.

 video/decode/:
-    vd_*.c are video decoders. (There's only vd_lavc.c left.) dec_video.c
-    handles most of connecting the frontend with the actual decoder.
+    vd_*.c are video decoders. (There's only vd_lavc.c left.) dec_video.c/vd.c
+    handle most of connecting the frontend with the actual decoder.

 video/filter/:
    vf_*.c and vf.c form the video filter chain. They are fed by the video
@@ -180,33 +181,31 @@ video/out/:
    vo_opengl can pick a windowing system at runtime, e.g. the same binary can
    provide both X11 and Cocoa support on OSX.

-    VOs can be reconfigured at runtime. A vo_reconfig() call can change the video
+    VOs can be reconfigured at runtime. A config() call can change the video
    resolution and format, without destroying the window.

-    vo_opengl should be taken as reference.
+    vo_vdpau and vo_opengl should be taken as reference.

 audio/:
    format.h/format.c define the uncompressed audio formats. (As well as some
    compressed formats used for spdif.)

 audio/decode/:
-    ad_*.c and dec_audio.c handle audio decoding. ad_lavc.c is the
+    ad_*.c and dec_audio.c/ad.c handle audio decoding. ad_lavc.c is the
    decoder using ffmpeg. ad_spdif.c is not really a decoder, but is used for
    compressed audio passthrough.

 audio/filter/:
    Audio filter chain. af_lavrresample is inserted if any form of conversion
-    between audio formats is needed.
+    between audio formats is needed. (af_convert24.c and af_convertsignendian.c
+    are also used for some formats not directly supported by FFmpeg.)

 audio/out/:
    Audio outputs.

-    Unlike VOs, AOs can't be reconfigured on a format change. On audio format
-    changes, the AO will simply be closed and re-opened.
-
-    There are wrappers to support for two types of audio APIs: push.c and
-    pull.c. ao.c calls into one of these. They contain generic code to deal
-    with the data flow these APIs impose.
+    Unlike VOs, AOs can't be reconfigured on a format change. Without
+    --gapless-audio, even playing a new file will close and re-open the audio
+    device.

    Note that mpv synchronizes the video to the audio. That's the reason
    why buggy audio drivers can have a bad influence on playback quality.
@@ -214,28 +213,36 @@ audio/out/:
 sub/:
    Contains subtitle and OSD rendering.

-    osd.c/.h is actually the OSD code. It queries dec_sub.c to retrieve
+    sub.c/.h is actually the OSD code. It queries dec_sub.c to retrieve
    decoded/rendered subtitles. osd_libass.c is the actual implementation of
    the OSD text renderer (which uses libass, and takes care of all the tricky
    fontconfig/freetype API usage and text layouting).

-    The VOs call osd.c to render OSD and subtitle (via e.g. osd_draw()). osd.c
-    in turn asks dec_sub.c for subtitle overlay bitmaps, which relays the
-    request to one of the sd_*.c subtitle decoders/renderers.
-
-    Subtitle loading is in demux/. The MPlayer subreader.c is mostly gone - parts
-    of it survive in demux_subreader.c. It's used as last fallback, or to handle
-    some text subtitle types on Libav. It should go away eventually. Normally,
-    subtitles are loaded via demux_lavf.c.
+    Subtitle loading is now in demux/ instead. demux_libass.c wraps loading
+    .ass subtitles via libass. demux_lavf.c loads most subtitle types via
+    FFmpeg. demux_subreader.c is the old MPlayer code. It's used as last
+    fallback, or to handle some text subtitle types on Libav. (It also can
+    load UTF-16 encoded subtitles without requiring the use of -sub-codepage.)
+    demux_subreader.c should eventually go away (maybe).

    The subtitles are passed to dec_sub.c and the subtitle decoders in sd_*.c
    as they are demuxed. All text subtitles are rendered by sd_ass.c. If text
-    subtitles are not in the ASS format, the libavcodec subtitle converters are
-    used (lavc_conv.c).
+    subtitles are not in the ASS format, subtitle converters are inserted, for
+    example sd_srt.c, which is used to convert SRT->ASS. sd_srt.c is also used
+    as general converter for text->ASS (to prevent interpretation of text as
+    ASS tags).

    Text subtitles can be preloaded, in which case they are read fully as soon
-    as the subtitle is selected. In this case, they are effectively stored in
-    sd_ass.c's internal state.
+    as the subtitle is selected, and then effectively stored in an ASS_Track.
+    It's used for external text subtitles, and required to make codepage
+    detection as well as timing postprocessing work. (Timing postprocessing
+    removes tiny gaps or overlaps between subtitle events.)
+
+player/timeline/:
+    A timeline is the abstraction used by loadfile.c to combine several files
+    into one seemingly linear video. It's mainly used for ordered chapters
+    playback. The high level code to find and load other files containing the
+    segments for playing an ordered chapters file is in tl_matroska.c.

 etc/:
    The file input.conf is actually integrated into the mpv binary by the
@@ -1,7 +1,7 @@
 waf build system overview
 =========================

-mpv's new build system is based on waf and it should completely replace the
+mpv's new build system is based on waf and it should completly replace the
 custom ./configure + Makefile based system inherited from MPlayer.

 Goals and the choice of waf
@@ -20,9 +20,8 @@ shortcomings:
   part is this pieces are spread apart in the configure and copy pasted for
   any single case. That brings us to..

-2) --enable-feature has to be overridden by the user and helps them understand that
-   they have libraries missing and should install them for the feature to be
-   enabled.
+2) --enable-feature has to override the user and help him understand that he
+   has libraries missing and should install them for the feature to be enabled.

 3) Must be customizable, hackable, pleasant to the developer eyes and to work
   with in general.
@@ -65,7 +64,7 @@ This defines a feature called ``vdpau`` which can be enabled or disabled by
 the users with configure flags (that's the meaning of ``--``). This feature
 depends on another feature whose name is ``x11``, and the autodetection check
 consists of running ``pkg-config`` and looking for ``vdpau`` with version
-``>= 0.2``. If the check succeeds a ``#define HAVE_VDPAU 1`` will be added to
+``>= 0.2``. If the check succeds a ``#define HAVE_VDPAU 1`` will be added to
 ``config.h``, if not ``#define HAVE_VDPAU 0`` will be added.

 The defines names are automatically prepended with ``HAVE_``, capitalized and
@@ -146,7 +145,7 @@ mpv's custom build step on top of waf

 Build step is pretty much vanilla waf. The only difference being that the list
 of source files can contain both strings or tuples. If a tuple is found,
-the second element in the tuple will be used to match the features detected
+the second element in the tuple will the used to match the features detected
 in the configure step (the ``name`` field described above). If this feature
 was not enabled during configure, the source file will not be compiled in.

@@ -1,502 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
@@ -1,84 +1,26 @@
-![http://mpv.io/](https://raw.githubusercontent.com/mpv-player/mpv.io/master/source/images/mpv-logo-128.png)
+mpv
+===

-## mpv
+[![Build Status](https://api.travis-ci.org/mpv-player/mpv.png)](https://travis-ci.org/mpv-player/mpv)

--------------
+Overview
+--------

-
-* [External links](#external-links)
-* [Overview](#overview)
-* [System requirements](#system-requirements)
-* [Downloads](#downloads)
-* [Changelog](#changelog)
-* [Compilation](#compilation)
-* [FFmpeg vs. Libav](#ffmpeg-vs-libav)
-* [FFmpeg ABI compatibility](#ffmpeg-abi-compatibility)
-* [Release cycle](#release-cycle)
-* [Bug reports](#bug-reports)
-* [Contributing](#contributing)
-* [Relation to MPlayer and mplayer2](#relation-to-mplayer-and-mplayer2)
-* [License](#license)
-* [Contact](#contact)
-
-
-## External links
-
-
-* [Wiki](https://github.com/mpv-player/mpv/wiki)
-* [FAQ](https://github.com/mpv-player/mpv/wiki/FAQ)
-* [Manual](http://mpv.io/manual/master/)
-
-
-## Overview
-
-
-**mpv** is a media player based on MPlayer and mplayer2. It supports a wide
+**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.

-Releases can be found on the [release list][releases].
-
-## System requirements
-
- A not too ancient Linux, Windows 7 or later, or OSX 10.8 or later.
- A somewhat capable CPU. Hardware decoding might help if the CPU is too slow to
-  decode video in realtime, but must be explicitly enabled with the `--hwdec`
-  option.
- A not too crappy GPU. mpv is not intended to be used with bad GPUs. There are
-  many caveats with drivers or system compositors causing tearing, stutter,
-  etc. On Windows, you might want to make sure the graphics drivers are
-  current. In some cases, ancient fallback video output methods can help
-  (such as `--vo=xv` on Linux), but this use is not recommended or supported.
-
-
-## Downloads
-
-
-For semi-official builds and third-party packages please see
-[mpv.io/installation](http://mpv.io/installation/).
-
-## Changelog
-
-
-There is no complete changelog; however, changes to the player core interface
-are listed in the [interface changelog][interface-changes].
-
-Changes to the C API are documented in the [client API changelog][api-changes].
-
-The [release list][releases] has a summary of most of the important changes
-on every release.
-
-Changes to the default key bindings are indicated in
-[restore-old-bindings.conf][restore-old-bindings].
-
-## Compilation
+If you are wondering what's different from mplayer2 and MPlayer you can read
+more about the [changes][changes].

+Compilation
+-----------

 Compiling with full features requires development files for several
 external libraries. Below is a list of some important requirements.

-The mpv build system uses [waf](https://waf.io/), but we don't store it in the
-repository. The `./bootstrap.py` script will download the latest version
-of waf that was tested with the build system.
+The mpv build system uses *waf* but we don't store it in your source tree. The
+script './bootstrap.py' will download the latest version of waf that was tested
+with the build system.

 For a list of the available build options use `./waf configure --help`. If
 you think you have support for some feature installed but configure fails to
@@ -95,151 +37,103 @@ To build the software you can use `./waf build`: the result of the compilation
 will be located in `build/mpv`. You can use `./waf install` to install mpv
 to the *prefix* after it is compiled.

-Example:
-
-    ./bootstrap.py
-    ./waf configure
-    ./waf
-    ./waf install
+NOTE: Using the old build system (with `./old-configure`) should still work,
+but will be removed in a future version of mpv.

 Essential dependencies (incomplete list):

 - gcc or clang
- X development headers (xlib, xrandr, xext, xscrnsaver, xinerama, libvdpau,
-  libGL, GLX, EGL, xv, ...)
- Audio output development headers (libasound/ALSA, pulseaudio)
- FFmpeg libraries (libavutil libavcodec libavformat libswscale libavfilter
-  and either libswresample or libavresample)
- zlib
- iconv (normally provided by the system libc)
- libass (OSD, OSC, text subtitles)
- Lua (optional, required for the OSC pseudo-GUI and youtube-dl integration)
- libjpeg (optional, used for screenshots only)
- uchardet (optional, for subtitle charset detection)
- vdpau and vaapi libraries for hardware decoding on Linux (optional)
+- X development headers (xlib, X extensions, libvdpau, libGL, libXv, ...)
+- Audio output development headers (libasound, pulseaudio)
+- FFmpeg libraries (libavutil libavcodec libavformat libswscale libavresample)
+  At least FFmpeg 2.1.4 or Libav 10 is required.
+- libjpeg (for screenshots)
+- libquvi if you want to play Youtube videos directly

 Libass dependencies:

 - gcc or clang, yasm on x86 and x86_64
 - fribidi, freetype, fontconfig development headers (for libass)
- harfbuzz (optional, required for correct rendering of combining characters,
-  particularly for correct rendering of non-English text on OSX, and
-  Arabic/Indic scripts on any platform)

 FFmpeg dependencies:

 - gcc or clang, yasm on x86 and x86_64
- OpenSSL or GnuTLS (have to be explicitly enabled when compiling FFmpeg)
- libx264/libmp3lame/libfdk-aac if you want to use encoding (have to be
-  explicitly enabled when compiling FFmpeg)
+- OpenSSL (has to be explicitly enabled when compiling ffmpeg)
+- libx264/libmp3lame/libfdk-aac if you want to use encoding (has to be
+  explicitly enabled when compiling ffmpeg)
 - Libav also works, but some features will not work. (See section below.)

 Most of the above libraries are available in suitable versions on normal
-Linux distributions. For ease of compiling the latest git master of everything,
-you may wish to use the separately available build wrapper ([mpv-build][mpv-build])
-which first compiles FFmpeg libraries and libass, and then compiles the player
-statically linked against those.
+Linux distributions. However FFmpeg is an exception (distro versions may be
+too old to work at all or work well). For that reason you may want to use
+the separately available build wrapper ([mpv-build][mpv-build]) that first compiles FFmpeg
+libraries and libass, and then compiles the player statically linked against
+those.

-If you want to build a Windows binary, you either have to use MSYS2 and MinGW,
-or cross-compile from Linux with MinGW. See
-[Windows compilation][windows_compilation].
-
-
-## FFmpeg vs. Libav
+If you are running Mac OSX and using homebrew we provide [homebrew-mpv][homebrew-mpv], an up
+to date formula that compiles mpv with sensible dependencies and defaults for
+OSX.

+FFmpeg vs. Libav
+----------------

 Generally, mpv should work with the latest release as well as the git version
 of both FFmpeg and Libav. But FFmpeg is preferred, and some mpv features work
-with FFmpeg only (subtitle formats in particular).
+with FFmpeg only. See the [wiki article][ffmpeg_vs_libav] about the issue.


-## FFmpeg ABI compatibility
+Release cycle
+-------------

-mpv does not support linking against FFmpeg versions it was not built with, even
-if the linked version is supposedly ABI-compatible with the version it was
-compiled against. Expect malfunctions, crashes, and security issues if you
-do it anyway.
+Every few months, a new release is cut off of the master branch and is assigned
+a 0.X.0 version number.

-The reason for not supporting this is because it creates far too much complexity
-with little to no benefit, coupled with absurd and unusable FFmpeg API
-artifacts.
+As part of the maintenance process, minor releases are made, which are assigned
+0.X.Y version numbers. Minor releases contain bug fixes only. They never merge
+the master branch, and no features are added to it. Only the latest release is
+maintained.

-Newer mpv versions will refuse to start if runtime and compile time FFmpeg
-library versions mismatch.
-
-## Release cycle
-
-Every other month, an arbitrary git snapshot is made, and is assigned
-a 0.X.0 version number. No further maintenance is done.
-
-The goal of releases is to make Linux distributions happy. Linux distributions
-are also expected to apply their own patches in case of bugs and security
-issues.
+The goal of releases is to provide stability and an unchanged base for the sake
+of Linux distributions. If you want the newest features, just use the master
+branch, which is stable most of the time, except sometimes, when it's not.

 Releases other than the latest release are unsupported and unmaintained.

 See the [release policy document][release-policy] for more information.

-## Bug reports
-
+Bug reports
+-----------

 Please use the [issue tracker][issue-tracker] provided by GitHub to send us bug
-reports or feature requests. Follow the template's instructions or the issue
-will likely be ignored or closed as invalid.
+reports or feature requests.

-Using the bug tracker as place for simple questions is fine but IRC is
-recommended (see [Contact](#Contact) below).
-
-## Contributing
-
-
-Please read [contribute.md][contribute.md].
+Contributing
+------------

 For small changes you can just send us pull requests through GitHub. For bigger
 changes come and talk to us on IRC before you start working on them. It will
 make code review easier for both parties later on.

-You can check [the wiki](https://github.com/mpv-player/mpv/wiki/Stuff-to-do)
-or the [issue tracker](https://github.com/mpv-player/mpv/issues?q=is%3Aopen+is%3Aissue+label%3A%22feature+request%22)
-for ideas on what you could contribute with.
+Contact
+-------

-## Relation to MPlayer and mplayer2
+These forms of contact are meant to ask questions about mpv usage, give
+feedback on mpv and discuss it's development.

-mpv is a fork of MPlayer. Much has changed, and in general, mpv should be
-considered a completely new program, rather than a MPlayer drop-in replacement.
+If possible, please avoid posting bugs here and use the [issue tracker][issue-tracker]
+instead.

-For details see [FAQ entry](https://github.com/mpv-player/mpv/wiki/FAQ#How_is_mpv_related_to_MPlayer).
+ - **Users IRC Channel**: `#mpv-player` on `irc.freenode.net`
+ - **Users Mailing List**: `mpv-users@googlegroups.com` ([Archive / Subscribe][mpv-users]).
+ - **Devel Mailing List**: `mpv-devel@googlegroups.com` ([Archive / Subscribe][mpv-devel])

-If you are wondering what's different from mplayer2 and MPlayer, an incomplete
-and largely unmaintained list of changes is located [here][mplayer-changes].
+To contact the `mpv` team in private write to `mpv-team@googlegroups.com`.

-## License
-
-GPLv2 "or later" by default, LGPLv2.1 "or later" with `--enable-lgpl`.
-See [details.](https://github.com/mpv-player/mpv/blob/master/Copyright)
-
-
-## Contact
-
-
-Most activity happens on the IRC channel and the github issue tracker.
-
- - **GitHub issue tracker**: [issue tracker][issue-tracker] (report bugs here)
- - **User IRC Channel**: `#mpv` on `irc.freenode.net`
- - **Developer IRC Channel**: `#mpv-devel` on `irc.freenode.net`
-
-To contact the `mpv` team in private write to `mpv-team@googlegroups.com`. Use
-only if discretion is required.
-
-[releases]: https://github.com/mpv-player/mpv/releases
+[changes]: https://github.com/mpv-player/mpv/blob/master/DOCS/man/changes.rst
 [mpv-build]: https://github.com/mpv-player/mpv-build
 [homebrew-mpv]: https://github.com/mpv-player/homebrew-mpv
 [issue-tracker]:  https://github.com/mpv-player/mpv/issues
+[mpv-users]: https://groups.google.com/forum/?hl=en#!forum/mpv-users
+[mpv-devel]: https://groups.google.com/forum/?hl=en#!forum/mpv-devel
 [ffmpeg_vs_libav]: https://github.com/mpv-player/mpv/wiki/FFmpeg-versus-Libav
 [release-policy]: https://github.com/mpv-player/mpv/blob/master/DOCS/release-policy.md
-[windows_compilation]: https://github.com/mpv-player/mpv/blob/master/DOCS/compile-windows.md
-[mplayer-changes]: https://github.com/mpv-player/mpv/blob/master/DOCS/mplayer-changes.rst
-[interface-changes]: https://github.com/mpv-player/mpv/blob/master/DOCS/interface-changes.rst
-[api-changes]: https://github.com/mpv-player/mpv/blob/master/DOCS/client-api-changes.rst
-[restore-old-bindings]: https://github.com/mpv-player/mpv/blob/master/etc/restore-old-bindings.conf
-[contribute.md]: https://github.com/mpv-player/mpv/blob/master/DOCS/contribute.md
@@ -1,178 +1,182 @@
-Release 0.28.2
-==============
+Release 0.4.2
+=============

-This release contains an additional fix for CVE-2018-6360.
+Bug fixes
+---------

-Fixes and Minor Enhancements
----------------------------
- ytdl_hook: whitelist subtitle URLs as well (#5456)
+- Include changes from point releases in the release notes.
+- Fix --cache-file operation when file size is unknown (e.g. when playing from
+  a pipe).
+- Don't sleep if playback is stopped when reconnecting for remote stream.
+- Suspend read on vts change even if the requested title is not found when
+  using dvdnav (dvd://) (this fixes a bug where the DVD menu was not shown
+  properly after a DVD track ended).
+- Avoid draining if the audio output is paused (this fixes a bug where mpv would
+  hang when switching tracks when paused).
+- Drop buffered audio when switching tracks or filters (this fixes a possible
+  regression when using gapless audio).
+- Reverse video rotation direction.
+- Fix initialization of the input when playing from a pipe.
+- Fix description of the --mf option in the manpage (the --mf syntax changed a
+  while ago, but was not documented).
+- Actually append entries to the end of the playlist instead of after the
+  current entry with the "loadlist append" command.

-Release 0.28.1
-==============
+New features
+------------

-This release fixes CVE-2018-6360.
+- Add "append-play" mode for the loadfile command.

-Fixes and Minor Enhancements
----------------------------
- ytdl_hook:  whitelist protocols from urls retrieved from youtube-dl (#5456)
+This listing is not complete. There are many more bug fixes and changes. The
+complete change log can be viewed by running ``git log bb00774..d50be0a`` in
+the git repository.

-Release 0.28.0
-==============
+Release 0.4.1
+=============

-This release needs recent FFmpeg (newer than 3.4) due to major refactoring.
-Required library versions:
+Bug fixes
+---------

-  * libavutil >= 56.6.100
-  * libavcodec >= 58.7.100
-  * libavformat >= 58.0.102
-  * libswscale >= 5.0.101
-  * libavfilter >= 7.0.101
-  * libswresample >= 3.0.100
+- Fix af_volume bug that caused negative ReplayGain values to increase volume
+  instead of decreasing it in some situations.
+- Actually use "weak" as --gapless-audio default value (as documented in the
+  0.4.0 release notes).
+- Fix cache resizing bug that caused seeking to not work anymore.
+- Escape all colons in the options descriptions in the zsh completion script.
+- Don't consume an extra argument with --ao/af and --vo/vf options in the zsh
+  completion script (as side effect, the completion now uses --opt=val instead
+  of --opt val).
+- Allow client applications to call mpv_terminate_destroy(NULL).
+- Make sure seeking bounds are within range with dvdnav://.
+- Check the length of the last title too with dvdnav://longest.
+- Properly flush buffers on DVD seek (this fixes some seeking problems when
+  playing DVDs).
+- Allow compilation without atomics (for compilers that don't support atomic
+  operations).
+- Disable ao_null latency emulation.
+- Restore ability to combine mouse buttons.

-The LGPL 2.1+ relicensing process is now mostly complete. The remaining GPL-only
-code (see Copyright file) can be disabled at build time by using --enable-lgpl.
+This listing is not complete. There are many more bug fixes and changes. The
+complete change log can be viewed by running ``git log 0075f8e..b18c2d9`` in
+the git repository.

-Features
--------
+Release 0.4.0
+=============

-Added
-~~~~~
+Changes
+-------

- Add DRM_PRIME Format Handling and Display for RockChip MPP decoders
- csputils: Add support for Display P3 primaries
- demux: support multiple seekable cached ranges, display cache ranges on OSC
- demux_playlist: support .url files (#5107)
- dvb: Add multiple frontends support (up to 8)
- dvb: implement parsing of modulation for VDR-style channels config
- hwdec: add mediacodec hardware decoder for IMGFMT_MEDIACODEC frames,
-  rename mediacodec to mediacodec-copy
- lua: integrate stats.lua script (bound to i/I by default)
- vd_lavc: add support for nvdec hwaccel
- vo_gpu: add android opengl backend
- vo_gpu: initial d3d11 support
- vo_gpu: vulkan support
+- Drop support for Libav 9 and earlier FFmpeg releases. At least FFmpeg 2.1.4 or
+  Libav 10 are now required.
+- Change cache options to take kilobytes instead of percentages, and raise the
+  default values.
+- Lower --auto-pause/resume defaults values to improve web streams playback.
+- Use dvdnav support instead of the internal dvd implementation for dvd:// URLs
+  (the old implementation is available under dvdread://).
+- DVD (dvd://) tracks IDs now start from 0 instead of 1.
+- Play the longest track by default with dvd://.
+- Rename some options to make them more consistent. Here's a partial list of
+  renamed options:

+  + Audio-related:

-Removed
-~~~~~~~
+    * --audiofile       → --audio-file
+    * --audiofile-cache → --audio-file-cache
+    * --channels        → --audio-channels
+    * --format          → --audio-format
+    * --srate           → --audio-samplerate

- af: remove deprecated audio filters (channels, equalizer, pan, volume;
-  replacements in lavfi)
- vf: remove most GPL video filters (crop, dsize, expand, flip, gradfun, mirror,
-  noformat, pullup, rotate, scale, stereo3d, yadif; replacements in lavfi)
- vf_buffer: remove this filter
- video: remove automatic stereo3d filter insertion
- vo_gpu: remove hwdec_vaglx interop
- vo_opengl: refactor into vo_gpu
- vo_wayland: remove
+  + Input-related:

+    * --ar              → --input-appleremote
+    * --consolecontrols → --input-terminal
+    * --media-keys      → --input-media-keys
+    * --joystick        → --input-joystick
+    * --lirc            → --input-lirc
+    * --lircconf        → --input-lirc-conf
+    * --mouse-movements → --input-cursor
+    * --right-alt-gr    → --input-right-alt-gr

-Options and Commands
--------------------
+  + Terminal-related:

-Added
-~~~~~
+    * --msgcolor    → --msg-color
+    * --msglevel    → --msg-level
+    * --msgmodule   → --msg-module
+    * --msgtime     → --msg-time
+    * --playing-msg → --term-playing-msg
+    * --status-msg  → --term-status-msg

- demux: add option to create CC tracks eagerly (--sub-create-cc-track)
- options: add --start=none to reset previously set start time
- options: add --vlang switch
+  + Subtitle-related:

+    * --ass           → --sub-ass
+    * --autosub       → --sub-auto
+    * --autosub-match → --sub-auto-match
+    * --sub           → --sub-file
+    * --subcp         → --sub-codepage
+    * --subfps        → --sub-fps

-Changed
-~~~~~~~
+  + Video-related:

- cache: lower default size to 2*10MB
- demux: bump the demuxer cache readahead duration to 10 hours
- demux: use seekable cache for network by default, bump prefetch limit
- msg: make --msg-level affect --log-file too
- player/misc.c: allow both --length and --end to control play endpoint
- player: match subtitles with language tags with --sub-auto=exact
- rename --opengl-hwdec-interop to --gpu-hwdec-interop (now mostly useless)
- vd_lavc: prefer nvdec over vdpau with --hwdec=auto (better codec and surface
-  format support)
- vd_lavc: rename --hwdec=rpi to --hwdec=mmal
+    * --aspect    → --video-aspect
+    * --fstype    → --x11-fstype
+    * --native-fs → --fs-missioncontrol
+    * --name      → --x11-name

+- Remove global options variables for --tv, --pvr, --dvb and --cdda.
+- Move post-processing support to a separate filter (vdpaupp) for the vdpau vo,
+  and deprecate the old vdpau post-processing options.
+- Remove radio:// support.
+- Remove support for ASX, SMIL and NSC playlist formats.
+- Re-introduce pretty-printing for module names with --msg-module.
+- Load Lua scripts under `$MPV_HOME/lua/` (default `~/.mpv/lua/`) automatically
+  (this can be disabled by using `--load-scripts=no`).
+- Corrupt/broken frames are not shown by default anymore (this can be re-enabled
+  by using --vd-lavc-show-all=yes).
+- Automatically copy metadata from the input file to the output when encoding
+  (this can be disabled by using --no-ometadata).
+- Change --sub-file semantics: if multiple --sub-file are used, the subtitle
+  tracks can be cycled at runtime and used with --sid and --secondary-sid.
+- Make the subtitle font size relative to the window, instead of the video, when
+  --sub-scale-with-window=yes is used.
+- Change default ao from wasapi to dsound on Windows.

-Removed
-~~~~~~~
+Bug fixes
+---------

- options: remove --heartbeat-cmd and --heartbeat-interval
-  (incidentally fixes #4888)
+- Fix tv:// playback with missing timestamps.
+- Fix display of cover art inside audio files with the vdpau vo.

+New features
+------------

-Fixes and Minor Enhancements
----------------------------
-
- TOOLS/autoload.lua: add ogm, ogg and opus extensions
- Use /dev/tty instead of stdin for terminal input (#4190)
- audio: add audio softvol processing to AO (replaces previously GPL’d code)
- audio: fix channel conversion with NA channels (e.g. with ALSA)
- audio: fix missing volume update on init and reinit
- csputils: Fix DCI P3 primaries white point
- demux: don't allow subtitles to mess up buffered time display
- demux: fix .cue files with audio files that contain attached pictures
- demux: fix accounting for seekable ranges on track switches (fixes missing
-  audio when cycling through audio tracks with e.g. EDL, --merge-files, ordered
-  chapters and youtube-dl pseudo DASH)
- demux: fix crash with cue/ordered chapter files (#5027)
- demux: speed up cache seeking with a coarse index
- demux_lavf: always give libavformat the filename when probing
-  (helps with mp3 files)
- demux_mkv: add V_SNOW tag to mkv_video_tags
- dvb: Fix long channel switching: next/prev channel
- dvb: fixes for ATSC tuning
- lavc_conv: clamp timestamps to positive (#5047)
- macOS: fix bundle on macOS High Sierra (10.13) (#4926, #4866)
- mp_image: always copy color attributes on hw download (#4804)
- mp_image: select an explicit fallback for chroma location (#4804)
- msg: bump log level of --log-file to -v -v
- msg: reinterpret a bunch of message levels
- osc: fix rare stack overflow when changing visibility mode
- osdep/io: add android-related bullshit to fix files >2 GiB
- player/playloop.c: respect playback start time when using --loop-file
- player: allow seeking in cached parts of unseekable streams
- player: make track language matching case insensitive (#5272)
- player: use start timestamp for ab-looping if --ab-loop-a is absent
- player: when loading external file, always add all track types (#5132)
- restore-old-bindings.conf: add old macOS/Wayland AXIS bindings
- screenshot: create directories from template
- scripting: report dlerror() output
- sd_ass: accept RFC8081 font media types
- sd_ass: accept otc as fallback OpenType collection file extension
- stream_libarchive: work around various types of locale braindeath
-  (https://git.io/vbiFJ)
- subprocess-win: don't change the mouse cursor when creating processes
- video: add a hack to avoid missing subtitles with vf_sub (#5194)
- video: fix alpha handling (#4983)
- video: fix memory leaks (roughly 1 KB per decoded frame) with hwdec copy modes
- video: fix rotation and deinterlace auto filters
- video: properly pass through ICC data
- vo: add support for externally driven renderloop and make wayland use it
-  (partially fixes display-sync under wayland; disables rendering when window
-  is invisible)
- vo_gpu: change --tone-mapping-desaturate algorithm
- vo_gpu: enable 3DLUTs in dumb mode
- vo_gpu: fix gamma scale
- vo_gpu: fix mobius tone mapping compatibility to GLSL 120 (#5069)
- vo_gpu: fix video sometimes not being rerendered on equalizer change
- vo_gpu: kill off FBOTEX_FUZZY (#1814)
- vo_gpu: opengl: fix possible screenshot window crash (#4905)
- vo_gpu: opengl: use GLX_MESA_swap_control where available
- vo_gpu: reduce the --alpha=blend-tiles checkerboard intensity
- vo_gpu: win: remove exclusive-fullscreen detection hack
- vo_lavc: remove messy delayed subtitle rendering logic (#4689)
- wayland_common: implement output tracking, many cleanups and bugfixes
- Windows: skip window snapping if Windows handled it
- Windows: add more-POSIXy versions of open() and fstat() (#4711)
- ytdl_hook: don't prepend ytdl:// to non-youtube links in playlists (#5003)
-
-
-This listing is not complete. Check DOCS/client-api-changes.rst for a history
-of changes to the client API, and DOCS/interface-changes.rst for a history
-of changes to other user-visible interfaces.
-
-A complete changelog can be seen by running `git log v0.27.0..v0.28.0`
-in the git repository or by visiting either
-https://github.com/mpv-player/mpv/compare/v0.27.0...v0.28.0 or
-https://git.srsfckn.biz/mpv/log/?qt=range&q=v0.27.0..v0.28.0
+- Add client API in the form of the libmpv library, which is intended to be a
+  stable API to get some rough control over the player (this is not supported on
+  Mac OS X).
+- Add option for approximating BT.709 gamma for the opengl vo (similarly to many
+  programs in the Apple ecosystem).
+- Add support for non-BT.709 primaries.
+- Add support for BT.2020 colorspace.
+- Generate and install zsh completion script (disabled by default since it may
+  interfere with cross-compilation).
+- Add support for looping a single file (instead of the whole playlist) with the
+  --loop-file option.
+- Add VapourSynth video filter (this has various restrictions, which are listed
+  in the manpage).
+- Add support for ReplayGain in the volume audio filter.
+- Add a --config-dir option to force config directory.
+- Add support for GPU switching on Mac OS X.
+- Add support for automatic selection of color profiles on Mac OS X.
+- Add support for binding commands to sequences of keys.
+- Add support for passing options to Lua scripts with --lua-opts.
+- Add some filesystem utility functions to the Lua API.
+- Add functions for observing property changes to the Lua API .
+- Add support for creating a cache file on the filesystem with --cache-file.
+- Add support for window dragging by grabbing with the x11 vo.
+- Add option to write file name to watch later file.
+- Add support for a "weak" gapless mode, and make it default (the old mode can
+  be enabled with --gapless-audio or --gapless-audio=yes).
+- Automatically detect network filesystems on Linux and Windows.

+This listing is not complete. There are many more bug fixes and changes. The
+complete change log can be viewed by running ``git log 56ce2a3..8bb7d42`` in
+the git repository.
@@ -1,27 +0,0 @@
-#!/usr/bin/bash
-set -e
-
-export DEST_OS=win32
-export CC=gcc
-export PKG_CONFIG=/usr/bin/pkg-config
-export PERL=/usr/bin/perl
-export PYTHON=/usr/bin/python3
-
-"$PYTHON" bootstrap.py
-"$PYTHON" waf configure \
-    --check-c-compiler=gcc \
-    --disable-egl-angle-lib \
-    --enable-crossc \
-    --enable-d3d-hwaccel \
-    --enable-d3d11 \
-    --enable-egl-angle \
-    --enable-jpeg \
-    --enable-lcms2 \
-    --enable-libarchive \
-    --enable-libass \
-    --enable-lua \
-    --enable-rubberband \
-    --enable-shaderc \
-    --enable-uchardet \
-    --enable-vulkan
-"$PYTHON" waf build
@@ -1,72 +0,0 @@
-#!/usr/bin/bash
-set -e
-
-# Write an empty fonts.conf to speed up fc-cache
-export FONTCONFIG_FILE=/dummy-fonts.conf
-cat >"$FONTCONFIG_FILE" <<EOF
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig></fontconfig>
-EOF
-
-# Install build dependencies for mpv
-pacman -S --noconfirm --needed \
-    $MINGW_PACKAGE_PREFIX-toolchain \
-    $MINGW_PACKAGE_PREFIX-angleproject-git \
-    $MINGW_PACKAGE_PREFIX-cmake \
-    $MINGW_PACKAGE_PREFIX-lcms2 \
-    $MINGW_PACKAGE_PREFIX-libarchive \
-    $MINGW_PACKAGE_PREFIX-libass \
-    $MINGW_PACKAGE_PREFIX-libjpeg-turbo \
-    $MINGW_PACKAGE_PREFIX-lua51 \
-    $MINGW_PACKAGE_PREFIX-ninja \
-    $MINGW_PACKAGE_PREFIX-rubberband \
-    $MINGW_PACKAGE_PREFIX-uchardet \
-    $MINGW_PACKAGE_PREFIX-vulkan
-
-# Delete unused packages to reduce space used in the Appveyor cache
-pacman -Sc --noconfirm
-
-# Compile ffmpeg
-(
-    git clone --depth=1 https://github.com/FFmpeg/ffmpeg.git && cd ffmpeg
-
-    mkdir build && cd build
-    ../configure \
-        --prefix=$MINGW_PREFIX \
-        --target-os=mingw32 \
-        --arch=$MSYSTEM_CARCH \
-        --disable-static \
-        --disable-doc \
-        --disable-asm \
-        --enable-gpl \
-        --enable-version3 \
-        --enable-shared \
-        --enable-pic \
-        --enable-d3d11va \
-        --enable-dxva2 \
-        --enable-schannel
-    make -j4 install
-)
-
-# Compile shaderc
-(
-    git clone --depth=1 https://github.com/google/shaderc && cd shaderc
-    git clone --depth=1 https://github.com/google/glslang.git third_party/glslang
-    git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Tools.git third_party/spirv-tools
-    git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers.git third_party/spirv-headers
-
-    mkdir build && cd build
-    cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DSHADERC_SKIP_TESTS=ON \
-          -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX ..
-    ninja install
-    cp -f libshaderc/libshaderc_shared.dll $MINGW_PREFIX/bin/
-)
-
-# Compile crossc
-(
-    git clone --depth=1 https://github.com/rossy/crossc && cd crossc
-    git submodule update --init
-
-    make -j4 install prefix=$MINGW_PREFIX
-)
@@ -15,11 +15,10 @@ def is_user_lib(objfile, libname):
    return not sys_re.match(libname) and \
           not usr_re.match(libname) and \
           not exe_re.match(libname) and \
-           not "libobjc." in libname and \
-           not "libSystem." in libname and \
-           not "libc." in libname and \
-           not "libgcc." in libname and \
-           not os.path.basename(libname) == 'Python' and \
+           not "libobjc" in libname and \
+           not "libSystem" in libname and \
+           not "libc" in libname and \
+           not "libgcc" in libname and \
           not os.path.basename(objfile) in libname

 def otool(objfile):
@@ -0,0 +1,24 @@
+#! /usr/bin/env perl
+
+use strict;
+use warnings;
+
+# Convert the contents of a file into a C string constant.
+# Note that the compiler will implicitly add an extra 0 byte at the end
+# of every string, so code using the string may need to remove that to get
+# the exact contents of the original file.
+# FIXME: why not a char array?
+
+# treat only alphanumeric and not-" punctuation as safe
+my $unsafe_chars = qr{[^][A-Za-z0-9!#%&'()*+,./:;<=>?^_{|}~ -]};
+
+for my $file (@ARGV) {
+    open my $fh, '<:raw', $file or next;
+    print "/* Generated from $file */\n";
+    while (<$fh>) {
+        # replace unsafe chars with their equivalent octal escapes
+        s/($unsafe_chars)/\\@{[sprintf '%03o', ord($1)]}/gos;
+        print "\"$_\"\n"
+    }
+    close $fh;
+}
@@ -1,48 +0,0 @@
-#!/usr/bin/env python
-
-# Convert the contents of a file into a C string constant.
-# Note that the compiler will implicitly add an extra 0 byte at the end
-# of every string, so code using the string may need to remove that to get
-# the exact contents of the original file.
-
-#
-# This file is part of mpv.
-#
-# mpv is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# mpv is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-from __future__ import unicode_literals
-import sys
-
-# Indexing a byte string yields int on Python 3.x, and a str on Python 2.x
-def pord(c):
-    return ord(c) if type(c) == str else c
-
-def file2string(infilename, infile, outfile):
-    outfile.write("// Generated from %s\n\n" % infilename)
-
-    conv = ['\\' + ("%03o" % c) for c in range(256)]
-    safe_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" \
-                 "0123456789!#%&'()*+,-./:;<=>?[]^_{|}~ "
-
-    for c in safe_chars:
-        conv[ord(c)] = c
-    for c, esc in ("\nn", "\tt", r"\\", '""'):
-        conv[ord(c)] = '\\' + esc
-    for line in infile:
-        outfile.write('"' + ''.join(conv[pord(c)] for c in line) + '"\n')
-
-if __name__ == "__main__":
-    with open(sys.argv[1], 'rb') as infile:
-        file2string(sys.argv[1], infile, sys.stdout)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# This script is expected to be called as TOOLS/gen-osd-font.sh (it will access
-# TOOLS/mpv-osd-symbols.sfdir), and it will write sub/osd_font.otf.
-
-# Needs fontforge with python scripting
-
-fontforge -lang=py -c 'f=open(argv[1]); f.generate(argv[2])' \
-    TOOLS/mpv-osd-symbols.sfdir sub/osd_font.otf
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# This script is expected to be called as TOOLS/gen-x11-icon.sh (it will access
+# etc/mpv-icon...), and it will write video/out/x11_icon.bin.
+
+conv() {
+    echo
+    identify -format "icon: %w %h" $1
+    convert $1 -depth 8 rgba:-
+}
+
+(echo "# File generated by gen-x11-icon.sh" ;
+ conv etc/mpv-icon-8bit-16x16.png ;
+ conv etc/mpv-icon-8bit-32x32.png ;
+ conv etc/mpv-icon-8bit-64x64.png) | gzip -c > video/out/x11_icon.bin
@@ -1,15 +1,23 @@
 #!/bin/sh

-: "${MPV:=mpv}"
-: "${ILDETECT_MPV:=$MPV}"
-: "${ILDETECT_MPVFLAGS:=--start=35% --length=35}"
-: "${ILDETECT_DRY_RUN:=}"
-: "${ILDETECT_QUIET:=}"
-: "${ILDETECT_RUN_INTERLACED_ONLY:=}"
-: "${ILDETECT_FORCE_RUN:=}"
+case "$0" in
+    */*)
+        MYDIR=${0%/*}
+        ;;
+    *)
+        MYDIR=.
+        ;;
+esac

-# This script uses ffmpeg's "idet" filter for interlace detection. In the
-# long run this should replace ildetect.sh+ildetect.so.
+: ${MPV:=mpv}
+: ${ILDETECT_MPV:=$MPV}
+: ${ILDETECT_MPV:=$MPV}
+: ${ILDETECT_MPVFLAGS:=--start=35% --length=35}
+: ${ILDETECT_DRY_RUN:=}
+: ${ILDETECT_QUIET:=}
+: ${ILDETECT_RUN_INTERLACED_ONLY:=}
+: ${ILDETECT_FORCE_RUN:=}
+: ${MAKE:=make}

 # exit status:
 # 0 progressive
@@ -22,131 +30,126 @@
 testfun()
 {
    $ILDETECT_MPV "$@" \
-        --vf-add=lavfi="[idet]" --msg-level ffmpeg=v \
+        --vf=lavfi="[idet]" --msg-level ffmpeg=v \
        --o= --vo=null --no-audio --untimed \
        $ILDETECT_MPVFLAGS \
        | { if [ -n "$ILDETECT_QUIET" ]; then cat; else tee /dev/stderr; fi } \
-        | grep "Parsed_idet_0: Multi frame detection: "
+        | grep "Parsed_idet_0: Multi frame detection: " | tail -n 1
 }

 judge()
 {
-    tff=0
-    bff=0
-    progressive=0
-    undetermined=0
-    while read -r _ _ _ _ _ _ tff1 _ bff1 _ progressive1 _ undetermined1 _; do
-        case "$tff1$bff1$progressive1$undetermined1" in
-            *[!0-9]*)
-                printf >&2 'ERROR: Unrecognized idet output: %s\n' "$out"
-                exit 16
-                ;;
-        esac
-        tff=$((tff + tff1))
-        bff=$((bff + bff1))
-        progressive=$((progressive + progressive1))
-        undetermined=$((undetermined + undetermined1))
-    done <<EOF
-$(testfun "$@" | sed 's/:/: /g')
-EOF
+    out=`testfun "$@"`
+
+    tff=${out##* TFF:}; tff=${tff%% *}
+    bff=${out##* BFF:}; bff=${bff%% *}
+    progressive=${out##* Progressive:}; progressive=${progressive%% *}
+    undetermined=${out##* Undetermined:}; undetermined=${undetermined%% *}
+
+    case "$tff$bff$progressive$undetermined" in
+        *[!0-9]*)
+            echo >&2 "ERROR: Unrecognized idet output: $out"
+            exit 16
+            ;;
+    esac

    interlaced=$((bff + tff))
    determined=$((interlaced + progressive))

-    if [ "$undetermined" -gt "$determined" ] || [ "$determined" -lt 250 ]; then
+    if [ $undetermined -gt $determined ] || [ $determined -lt 250 ]; then
        echo >&2 "ERROR: Less than 50% or 250 frames are determined."
        [ -n "$ILDETECT_FORCE_RUN" ] || exit 8
        echo >&2 "Assuming interlacing."
-        if [ "$tff" -gt $((bff * 10)) ]; then
-            verdict="interlaced-tff"
-        elif [ "$bff" -gt $((tff * 10)) ]; then
-            verdict="interlaced-bff"
+        if [ $tff -gt $((bff * 10)) ]; then
+            verdict=interlaced-tff
+        elif [ $bff -gt $((tff * 10)) ]; then
+            verdict=interlaced-bff
        else
-            verdict="interlaced"
+            verdict=interlaced
        fi
-    elif [ $((interlaced * 20)) -gt "$progressive" ]; then
+    elif [ $((interlaced * 20)) -gt $progressive ]; then
        # At least 5% of the frames are interlaced!
-        if [ "$tff" -gt $((bff * 10)) ]; then
-            verdict="interlaced-tff"
-        elif [ "$bff" -gt $((tff * 10)) ]; then
-            verdict="interlaced-bff"
+        if [ $tff -gt $((bff * 10)) ]; then
+            verdict=interlaced-tff
+        elif [ $bff -gt $((tff * 10)) ]; then
+            verdict=interlaced-bff
        else
            echo >&2 "ERROR: Content is interlaced, but can't determine field order."
            [ -n "$ILDETECT_FORCE_RUN" ] || exit 8
            echo >&2 "Assuming interlacing with default field order."
-            verdict="interlaced"
+            verdict=interlaced
        fi
    else
-        # Likely progressive
-        verdict="progressive"
+        # Likely progrssive.
+        verdict=progressive
    fi

-    printf '%s\n' "$verdict"
+    echo "$verdict"
 }

-judge "$@" --vf-clr
+judge "$@"
 case "$verdict" in
    progressive)
        [ -n "$ILDETECT_DRY_RUN" ] || \
            [ -n "$ILDETECT_RUN_INTERLACED_ONLY" ] || \
            $ILDETECT_MPV "$@"
        r=$?
-        [ $r -eq 0 ] || exit $((r | 16))
+        [ $r -eq 0 ] || exit $(($r | 16))
        exit 0
        ;;
    interlaced-tff)
-        judge "$@" --vf-clr --vf-pre=lavfi=\[setfield=tff\],pullup
+        judge "$@" --vf-pre=pullup --field-dominance=top
        case "$verdict" in
            progressive)
                [ -n "$ILDETECT_DRY_RUN" ] || \
-                    $ILDETECT_MPV "$@" --vf-pre=lavfi=\[setfield=tff\],pullup
+                    $ILDETECT_MPV "$@" --vf-pre=pullup --field-dominance=top
                r=$?
-                [ $r -eq 0 ] || exit $((r | 16))
+                [ $r -eq 0 ] || exit $(($r | 16))
                exit 1
                ;;
            *)
                [ -n "$ILDETECT_DRY_RUN" ] || \
-                    $ILDETECT_MPV "$@" --vf-pre=lavfi=\[setfield=tff\],yadif
+                    $ILDETECT_MPV "$@" --vf-pre=yadif --field-dominance=top
                r=$?
-                [ $r -eq 0 ] || exit $((r | 16))
+                [ $r -eq 0 ] || exit $(($r | 16))
                exit 2
                ;;
        esac
        ;;
    interlaced-bff)
-        judge "$@" --vf-clr --vf-pre=lavfi=\[setfield=bff\],pullup
+        judge "$@" --vf-pre=pullup --field-dominance=bottom
        case "$verdict" in
            progressive)
                [ -n "$ILDETECT_DRY_RUN" ] || \
-                    $ILDETECT_MPV "$@" --vf-pre=lavfi=\[setfield=bff\],pullup
+                    $ILDETECT_MPV "$@" --vf-pre=pullup --field-dominance=bottom
                r=$?
-                [ $r -eq 0 ] || exit $((r | 16))
+                [ $r -eq 0 ] || exit $(($r | 16))
                exit 1
                ;;
            *)
                [ -n "$ILDETECT_DRY_RUN" ] || \
-                    $ILDETECT_MPV "$@" --vf-pre=lavfi=\[setfield=bff\],yadif
+                    $ILDETECT_MPV "$@" --vf-pre=yadif --field-dominance=bottom
                r=$?
-                [ $r -eq 0 ] || exit $((r | 16))
+                [ $r -eq 0 ] || exit $(($r | 16))
                exit 2
                ;;
        esac
        ;;
    interlaced)
-        judge "$@" --vf-clr --vf-pre=pullup
+        judge "$@" --vf-pre=pullup
        case "$verdict" in
            progressive)
                [ -n "$ILDETECT_DRY_RUN" ] || \
                    $ILDETECT_MPV "$@" --vf-pre=pullup
                r=$?
-                [ $r -eq 0 ] || exit $((r | 16))
+                [ $r -eq 0 ] || exit $(($r | 16))
                exit 1
                ;;
            *)
                [ -n "$ILDETECT_DRY_RUN" ] || \
                    $ILDETECT_MPV "$@" --vf-pre=yadif
                r=$?
-                [ $r -eq 0 ] || exit $((r | 16))
+                [ $r -eq 0 ] || exit $(($r | 16))
                exit 2
                ;;
        esac
@@ -0,0 +1,30 @@
+use 5.008;
+use strict;
+use warnings;
+
+# ABSTRACT: Module collection to parse Matroska files.
+package Parse::Matroska;
+
+=head1 DESCRIPTION
+
+C<use>s L<Parse::Matroska::Reader>. See the documentation
+of the modules mentioned in L</"SEE ALSO"> for more information
+in how to use this module.
+
+It's intended for this module to contain high-level interfaces
+to the other modules in the distribution.
+
+=head1 SOURCE CODE
+
+L<https://github.com/Kovensky/Parse-Matroska>
+
+=head1 SEE ALSO
+
+L<Parse::Matroska::Reader>, L<Parse::Matroska::Element>,
+L<Parse::Matroska::Definitions>.
+
+=cut
+
+use Parse::Matroska::Reader;
+
+1;
@@ -0,0 +1,351 @@
+use 5.008;
+use strict;
+use warnings;
+
+# ABSTRACT: internal EBML grammar definitions
+package Parse::Matroska::Definitions;
+
+use Parse::Matroska::Utils qw{uniq uncamelize};
+
+use Exporter;
+our @ISA       = qw{Exporter};
+our @EXPORT_OK = qw{elem_by_hexid %EBML_DEFINITION %MATROSKA_DEFINITION};
+
+=head1 SYNOPSIS
+
+    use Parse::Matroska::Definitions qw{elem_by_hexid};
+    my $ebml_id = elem_by_hexid('1a45dfa3');
+    print "EBML ID $ebml_id->{elid}'s name: $ebml_id->{name}";
+
+=head1 DESCRIPTION
+
+Contains the definition of the EBML grammar as expected in
+Matroska files. This module is meant mostly for internal use.
+
+As this was extended from a script in mpv-player, some data
+generated is apparently useless for regular module users
+but is still relevant to the mpv-player script. Such data
+is annotated as being for mpv compatibility.
+
+=head1 NOTE
+
+The API of this module is not yet considered stable.
+
+=head1 GLOBALS
+
+These global variables are considered B<immutable>.
+
+=head2 @Parse::Matroska::Definitions::global_elem_list
+
+A global list of known matroska elements. Useful for
+mpv's matroska script, used for generating C headers
+that parse matroska.
+
+=head2 %Parse::Matroska::Definitions::global_elem_dict
+
+A global hash of known matroska elements. Used internally
+by L</elem_by_hexid($id)>.
+
+=cut
+
+@Parse::Matroska::Definitions::global_elem_list = ();
+%Parse::Matroska::Definitions::global_elem_dict = ();
+
+=head2 %EBML_DEFINITION
+
+Optionally-importable hash of known EBML IDs belonging
+to the EBML generic grammar.
+
+=head2 %MATROSKA_DEFINITION
+
+Optionally-importable hash of known EBML IDs belonging
+to the Matroska-specific grammar.
+
+=cut
+
+our %EBML_DEFINITION = define_ebml();
+our %MATROSKA_DEFINITION = define_matroska();
+
+=method elem_by_hexid($id)
+
+Returns an EBML Element Definition corresponding to the provided
+hexadecimal string. Returns C<undef> if the element is unknown.
+
+=cut
+sub elem_by_hexid {
+    my ($elid) = @_;
+    return $Parse::Matroska::Definitions::global_elem_dict{$elid};
+}
+
+################################################
+### Helper functions for document definition ###
+################################################
+
+# used by elem when setting the 'valname' key
+use constant TYPE_MAP => {
+    uint    => 'uint64_t',
+    str     => 'struct bstr',
+    binary  => 'struct bstr',
+    ebml_id => 'uint32_t',
+    float   => 'double',
+    sint    => 'int64_t',
+};
+
+# this will be localized to "MATROSKA" or "EBML" on the elem declarations
+our $ELEM_DEFINE_TYPE = undef;
+
+=method elem($name,$elid,$valtype)
+
+NOTE: never call this function yourself; it changes data structures
+that are considered immutable outside of this package.
+
+Internal API function that generates the EBML Element Definitions.
+
+This API function returns an array which first element is C<$elid>
+and the second is a generated hash. The generated hash is stored
+in the @global_elem_list and %global_elem_dict.
+
+The generated hash contains:
+
+=for :list
+= name
+The EBML Element's name, given through C<$name>.
+= elid
+The EBML Element's hex id, given through C<$elid>. Used for lookups by L</elem_by_hexid($id)>.
+= valtype
+The EBML Element's type, given through C<$valtype>, except when C<$valtype> is an arrayref.
+= multiple
+If C<$name> ends with a C<*>, this is set as true and strips the C<*> from L</name>. Used to
+mark elements that may be repeated.
+= subelements
+An arrayref of elements that may be children of this element, given through C<$valtype> if it
+is an arrayref. Sets L</valtype> to C<sub> if there are subelements.
+= subids
+An arrayref listing all the L</elid>s of subelements, C<uniq>ified.
+
+The following elements are for mpv compatibility:
+
+=for :list
+= definename
+Name used for generating C #defines.
+= fieldname
+Name used for generating C struct fields.
+= structname
+Name used for generating C struct names.
+= ebmltype
+A pre-#defined constant to describe the element's type.
+= valname
+Typename used when declaring a struct field referring to this element.
+
+=cut
+sub elem {
+    my %e = (name => shift, elid => shift, valtype => shift);
+
+    # strip * from name, set 'multiple' if there was one
+    $e{multiple} = scalar $e{name} =~ s/\*$//;
+
+    # ELEM_DEFINE_TYPE is either MATROSKA or EBML
+    $e{definename} = "${ELEM_DEFINE_TYPE}_ID_".uc($e{name});
+    $e{fieldname} = uncamelize $e{name};
+    $e{structname} = "ebml_$e{fieldname}";
+
+    if (ref $e{valtype} eq 'HASH') {
+        $e{subelements} = $e{valtype};
+        $e{subids} = uniq map { $_->{elid} } values %{$e{subelements}};
+        $e{valtype} = 'sub';
+        $e{ebmltype} = 'EBML_TYPE_SUBELEMENTS';
+        $e{valname} = "struct $e{structname}";
+    } else {
+        $e{ebmltype} = "EBML_TYPE_\U$e{valtype}";
+        die "Unrecognized value type $e{valtype}" unless
+            defined ($e{valname} = TYPE_MAP->{$e{valtype}});
+    }
+    my $e = \%e;
+    push @Parse::Matroska::Definitions::global_elem_list, $e;
+    $Parse::Matroska::Definitions::global_elem_dict{$e{elid}} = $e;
+    return ($e{elid}, $e);
+}
+
+#############################################
+### EBML and Matroska document definitons ###
+#############################################
+
+=method define_ebml
+
+Internal function that defines the EBML generic grammar.
+
+Must not be called from outside the package.
+
+=cut
+sub define_ebml {
+    local $ELEM_DEFINE_TYPE = 'EBML';
+    return (
+        elem('EBML', '1a45dfa3', {
+            elem('EBMLVersion',        '4286', 'uint'),
+            elem('EBMLReadVersion',    '42f7', 'uint'),
+            elem('EBMLMaxIDLength',    '42f2', 'uint'),
+            elem('EBMLMaxSizeLength',  '42f3', 'uint'),
+            elem('DocType',            '4282', 'str'),
+            elem('DocTypeVersion',     '4287', 'uint'),
+            elem('DocTypeReadVersion', '4285', 'uint'),
+        }),
+
+        elem('CRC32',      'bf', 'binary'),
+        elem('Void',       'ec', 'binary'),
+    );
+}
+
+
+=method define_matroska
+
+Internal function that defines the Matroska-specific EBML grammar.
+
+Must not be called from outside the package.
+
+=cut
+sub define_matroska {
+    local $ELEM_DEFINE_TYPE = 'MATROSKA';
+    return (
+        elem('Segment', '18538067', {
+            elem('SeekHead*', '114d9b74', {
+                elem('Seek*', '4dbb', {
+                    elem('SeekID',       '53ab', 'ebml_id'),
+                    elem('SeekPosition', '53ac', 'uint'),
+                }),
+            }),
+
+            elem('Info*', '1549a966', {
+                elem('SegmentUID',      '73a4', 'binary'),
+                elem('PrevUID',       '3cb923', 'binary'),
+                elem('NextUID',       '3eb923', 'binary'),
+                elem('TimecodeScale', '2ad7b1', 'uint'),
+                elem('DateUTC',         '4461', 'sint'),
+                elem('Title',           '7ba9', 'str'),
+                elem('MuxingApp',       '4d80', 'str'),
+                elem('WritingApp',      '5741', 'str'),
+                elem('Duration',        '4489', 'float'),
+            }),
+
+            elem('Cluster*', '1f43b675', {
+                elem('Timecode', 'e7', 'uint'),
+                elem('BlockGroup*', 'a0', {
+                    elem('Block',           'a1', 'binary'),
+                    elem('BlockDuration',   '9b', 'uint'),
+                    elem('ReferenceBlock*', 'fb', 'sint'),
+                }),
+                elem('SimpleBlock*', 'a3', 'binary'),
+            }),
+
+            elem('Tracks*', '1654ae6b', {
+                elem('TrackEntry*', 'ae', {
+                    elem('TrackNumber',            'd7', 'uint'),
+                    elem('TrackUID',             '73c5', 'uint'),
+                    elem('TrackType',              '83', 'uint'),
+                    elem('FlagEnabled',            'b9', 'uint'),
+                    elem('FlagDefault',            '88', 'uint'),
+                    elem('FlagForced',           '55aa', 'uint'),
+                    elem('FlagLacing',             '9c', 'uint'),
+                    elem('MinCache',             '6de7', 'uint'),
+                    elem('MaxCache',             '6df8', 'uint'),
+                    elem('DefaultDuration',    '23e383', 'uint'),
+                    elem('TrackTimecodeScale', '23314f', 'float'),
+                    elem('MaxBlockAdditionID',   '55ee', 'uint'),
+                    elem('Name',                 '536e', 'str'),
+                    elem('Language',           '22b59c', 'str'),
+                    elem('CodecID',                '86', 'str'),
+                    elem('CodecPrivate',         '63a2', 'binary'),
+                    elem('CodecName',          '258688', 'str'),
+                    elem('CodecDecodeAll',         'aa', 'uint'),
+                    elem('Video', 'e0', {
+                        elem('FlagInterlaced',  '9a', 'uint'),
+                        elem('PixelWidth',      'b0', 'uint'),
+                        elem('PixelHeight',     'ba', 'uint'),
+                        elem('DisplayWidth',  '54b0', 'uint'),
+                        elem('DisplayHeight', '54ba', 'uint'),
+                        elem('DisplayUnit',   '54b2', 'uint'),
+                        elem('FrameRate',   '2383e3', 'float'),
+                        elem('ColourSpace', '2eb524', 'binary'),
+                    }),
+                    elem('Audio', 'e1', {
+                        elem('SamplingFrequency',         'b5', 'float'),
+                        elem('OutputSamplingFrequency', '78b5', 'float'),
+                        elem('Channels',                  '9f', 'uint'),
+                        elem('BitDepth',                '6264', 'uint'),
+                    }),
+                    elem('ContentEncodings', '6d80', {
+                        elem('ContentEncoding*', '6240', {
+                            elem('ContentEncodingOrder', '5031', 'uint'),
+                            elem('ContentEncodingScope', '5032', 'uint'),
+                            elem('ContentEncodingType',  '5033', 'uint'),
+                            elem('ContentCompression', '5034', {
+                                elem('ContentCompAlgo',     '4254', 'uint'),
+                                elem('ContentCompSettings', '4255', 'binary'),
+                            }),
+                        }),
+                    }),
+                }),
+            }),
+
+            elem('Cues', '1c53bb6b', {
+                elem('CuePoint*', 'bb', {
+                    elem('CueTime', 'b3', 'uint'),
+                    elem('CueTrackPositions*', 'b7', {
+                        elem('CueTrack',           'f7', 'uint'),
+                        elem('CueClusterPosition', 'f1', 'uint'),
+                    }),
+                }),
+            }),
+
+            elem('Attachments', '1941a469', {
+                elem('AttachedFile*', '61a7', {
+                    elem('FileDescription', '467e', 'str'),
+                    elem('FileName',        '466e', 'str'),
+                    elem('FileMimeType',    '4660', 'str'),
+                    elem('FileData',        '465c', 'binary'),
+                    elem('FileUID',         '46ae', 'uint'),
+                }),
+            }),
+
+            elem('Chapters', '1043a770', {
+                elem('EditionEntry*', '45b9', {
+                    elem('EditionUID',         '45bc', 'uint'),
+                    elem('EditionFlagHidden',  '45bd', 'uint'),
+                    elem('EditionFlagDefault', '45db', 'uint'),
+                    elem('EditionFlagOrdered', '45dd', 'uint'),
+                    elem('ChapterAtom*', 'b6', {
+                        elem('ChapterUID',               '73c4', 'uint'),
+                        elem('ChapterTimeStart',           '91', 'uint'),
+                        elem('ChapterTimeEnd',             '92', 'uint'),
+                        elem('ChapterFlagHidden',          '98', 'uint'),
+                        elem('ChapterFlagEnabled',       '4598', 'uint'),
+                        elem('ChapterSegmentUID',        '6e67', 'binary'),
+                        elem('ChapterSegmentEditionUID', '6ebc', 'uint'),
+                        elem('ChapterDisplay*', '80', {
+                            elem('ChapString',      '85', 'str'),
+                            elem('ChapLanguage*', '437c', 'str'),
+                            elem('ChapCountry*',  '437e', 'str'),
+                        }),
+                    }),
+                }),
+            }),
+            elem('Tags*', '1254c367', {
+                elem('Tag*', '7373', {
+                    elem('Targets', '63c0', {
+                        elem('TargetTypeValue',     '68ca', 'uint'),
+                        elem('TargetTrackUID',      '63c5', 'uint'),
+                        elem('TargetEditionUID',    '63c9', 'uint'),
+                        elem('TargetChapterUID',    '63c4', 'uint'),
+                        elem('TargetAttachmentUID', '63c6', 'uint'),
+                     }),
+                    elem('SimpleTag*', '67c8', {
+                        elem('TagName',     '45a3', 'str'),
+                        elem('TagLanguage', '447a', 'str'),
+                        elem('TagString',   '4487', 'str'),
+                    }),
+                }),
+            }),
+        }),
+    );
+}
+
+1;
@@ -0,0 +1,331 @@
+use 5.008;
+use strict;
+use warnings;
+
+# ABSTRACT: a mid-level representation of an EBML element
+package Parse::Matroska::Element;
+
+use Carp;
+use List::Util qw{first};
+
+=head1 SYNOPSIS
+
+    use Parse::Matroska::Reader;
+    my $reader = Parse::Matroska::Reader->new($path);
+    my $elem = $reader->read_element;
+
+    print "ID: $elem->{elid}\n";
+    print "Name: $elem->{name}\n";
+    print "Length: $elem->{content_len}\n";
+    print "Type: $elem->{type}\n";
+    print "Child count: ", scalar(@{$elem->all_children}), "\n";
+    if ($elem->{type} eq 'sub') {
+        while (my $chld = $elem->next_child) {
+            print "Child Name: $chld->{name}\n";
+        }
+    } else {
+        print "Value: ", $elem->get_value, "\n";
+    }
+
+=head1 DESCRIPTION
+
+Represents a single Matroska element as decoded by
+L<Parse::Matroska::Reader>. This is essentially a hash
+augmented with functions for delay-loading of binary
+values and children elements.
+
+=head1 NOTE
+
+The API of this module is not yet considered stable.
+
+=attr elid
+
+The EBML Element ID, suitable for passing to
+L<Parse::Matroska::Definitions/elem_by_hexid>.
+
+=attr name
+
+The EBML Element's name.
+
+=attr type
+
+The EBML Element's type. Can be C<uint>, C<sint>,
+C<float>, C<ebml_id>, C<str> or C<binary>. See L</value>
+for details.
+
+Equivalent to
+C<elem_by_hexid($elem-E<gt>{value})-E<gt>{valtype}>.
+
+=attr value
+
+The EBML Element's value. Should be obtained through
+L</get_value>.
+
+Is an unicode string if the L</type> is C<str>, that is,
+the string has already been decoded by L<Encode/decode>.
+
+Is C<undef> if the L</type> is C<binary> and the contents
+were delay-loaded and not yet read. L</get_value> will
+do the delayed load if needed.
+
+Is an arrayref if the L</type> is C<sub>, containing
+the children nodes that were already loaded.
+
+Is a hashref if the L</type> is C<ebml_id>, containing
+the referred element's information as defined in
+L<Parse::Matroska::Definitions>. Calling
+C<elem_by_hexid($elem-E<gt>{value}-E<gt>{elid})> will
+return the same object as $elem->{value}.
+
+=attr full_len
+
+The entire length of this EBML Element, including
+the header's.
+
+=attr size_len
+
+The length of the size marker. Used when calculating
+L</full_len> from L</content_len>
+
+=attr content_len
+
+The length of the contents of this EBML Element,
+which excludes the header.
+
+=attr reader
+
+A weakened reference to the associated
+L<Parse::Matroska::Reader>.
+
+=method new(%hash)
+
+Creates a new Element initialized with the hash
+given as argument.
+
+=cut
+sub new {
+    my $class = shift;
+    my $self = {};
+    bless $self, $class;
+
+    $self->initialize(@_);
+    return $self;
+}
+
+=method initialize(%hash)
+
+Called by L</new> on initialization.
+
+=cut
+sub initialize {
+    my ($self, %args) = @_;
+    for (keys %args) {
+        $self->{$_} = $args{$_};
+    }
+    $self->{depth} = 0 unless $self->{depth};
+}
+
+=method skip
+
+Called by the user to ignore the contents of this EBML node.
+Needed when ignoring the children of a node.
+
+=cut
+sub skip {
+    my ($self) = @_;
+    my $reader = $self->{reader};
+    return unless $reader; # we don't have to skip if there's no reader
+    my $pos = $reader->getpos;
+    croak "Too late to skip, reads were already done"
+        if $pos ne $self->{data_pos};
+    $reader->skip($self->{content_len});
+}
+
+=method get_value($keep_bin)
+
+Returns the value contained by this EBML element.
+
+If the element has children, returns an arrayref to
+the children elements that were already encountered.
+
+If the element's type is C<binary> and the value was
+delay-loaded, does the reading now.
+
+If $keep_bin is true, the delay-loaded data is kept
+as the L</value>, otherwise, further calls to
+C<get_value> will reread the data from the L</reader>.
+
+=cut
+sub get_value {
+    my ($self, $keep_bin) = @_;
+
+    return undef if $self->{type} eq 'skip';
+    return $self->{value} if $self->{value};
+
+    my $reader = $self->{reader} or
+        croak "The associated Reader has been deleted";
+
+    # delay-loaded 'binary'
+    if ($self->{type} eq 'binary') {
+        croak "Cannot seek in the current Reader" unless $self->{data_pos};
+        # seek to the data position...
+        $reader->setpos($self->{data_pos});
+        # read the data, keeping it in value if requested
+        if ($keep_bin) {
+            $self->{value} = $reader->readlen($self->{content_len});
+            return $self->{value};
+        } else {
+            return $reader->readlen($self->{content_len});
+        }
+    }
+}
+
+=method next_child($read_bin)
+
+Builtin iterator; reads and returns the next child element.
+Always returns undef if the type isn't C<sub>.
+
+Returns undef at the end of the iterator and resets itself to
+point to the first element; so calling L</next_child($read_bin)>
+after the iterator returned C<undef> will return the first child.
+
+The optional C<$read_bin> parameter has the children elements
+not delay-load their value if their type is C<binary>.
+
+If all children elements have already been read, return
+each element in-order as would be given by
+L</all_children($recurse,$read_bin)>.
+
+=cut
+sub next_child {
+    my ($self, $read_bin) = @_;
+    return unless $self->{type} eq 'sub';
+
+    if ($self->{_all_children_read}) {
+        my $idx = $self->{_last_child} ||= 0;
+        if ($idx == @{$self->{value}}) {
+            # reset the iterator, returning undef once
+            $self->{_last_child} = 0;
+            return;
+        }
+        my $ret = $self->{value}->[$idx];
+
+        ++$idx;
+        $self->{_last_child} = $idx;
+        return $ret;
+    }
+
+    my $len = defined $self->{remaining_len}
+        ? $self->{remaining_len}
+        : $self->{content_len};
+
+    if ($len == 0) {
+        # we've read all children; switch into $self->{value} iteration mode
+        $self->{_all_children_read} = 1;
+        # return undef since the iterator will reset
+        return;
+    }
+
+    $self->{pos_offset} ||= 0;
+    my $pos = $self->{data_pos};
+    my $reader = $self->{reader} or croak "The associated reader has been deleted";
+    $reader->setpos($pos);
+    $reader->{fh}->seek($self->{pos_offset}, 1) if $pos;
+
+    my $chld = $reader->read_element($read_bin);
+    return undef unless defined $chld;
+    $self->{pos_offset} += $chld->{full_len};
+
+    $self->{remaining_len} = $len - $chld->{full_len};
+
+    if ($self->{remaining_len} < 0) {
+        croak "Child elements consumed $self->{remaining_len} more bytes than parent $self->{name} contained";
+    }
+
+    $chld->{depth} = $self->{depth} + 1;
+    $self->{value} ||= [];
+
+    push @{$self->{value}}, $chld;
+
+    return $chld;
+}
+
+=method all_children($recurse,$read_bin)
+
+Calls L</populate_children($recurse,$read_bin)> on self
+and returns an arrayref with the children nodes.
+
+Both C<$recurse> and C<$read_bin> are optional and default
+to false.
+
+=cut
+sub all_children {
+    my ($self, $recurse, $read_bin) = @_;
+    $self->populate_children($recurse, $read_bin);
+    return $self->{value};
+}
+
+=method children_by_name($name)
+
+Searches in the already read children elements for all
+elements with the EBML name C<$name>. Returns an array
+containing all found elements. On scalar context,
+returns only the first element found.
+
+Croaks if the element's C<type> isn't C<sub>.
+
+=cut
+sub children_by_name {
+    my ($self, $name) = @_;
+    return unless defined wantarray; # don't do work if work isn't wanted
+    croak "Element can't have children" unless $self->{type} eq 'sub';
+
+    my @found = grep { $_->{name} eq $name } @{$self->{value}};
+    return @found       if wantarray;         # list
+    return shift @found if defined wantarray; # scalar
+}
+
+=method populate_children($recurse,$read_bin)
+
+Populates the internal array of children elements, that is,
+requests that the associated L<Matroska::Parser::Reader> reads
+all children elements. Returns itself.
+
+Returns false if the element's C<type> isn't C<sub>.
+
+If C<$recurse> is provided and is true, the method will call
+itself in the children elements with the same parameters it
+received; this will build a full EBML tree.
+
+If C<$read_bin> is provided and is true, disables delay-loading
+of the contents of C<binary>-type nodes, reading the contents
+to memory.
+
+If both C<$recurse> and C<$read_bin> are true, entire EBML trees
+can be loaded without requiring seeks, thus behaving correctly
+on unseekable streams. If C<$read_bin> is false, the entire EBML
+tree is still loaded, but calling L</get_value> on C<binary>-type
+nodes will produce an error on unseekable streams.
+
+=cut
+sub populate_children {
+    my ($self, $recurse, $read_bin) = @_;
+
+    return unless $self->{type} eq 'sub';
+
+    if (@{$self->{value}} && $recurse) {
+        # only recurse
+        foreach (@{$self->{value}}) {
+            $_->populate_children($recurse, $read_bin);
+        }
+        return $self;
+    }
+
+    while (my $chld = $self->next_child($read_bin)) {
+        $chld->populate_children($recurse, $read_bin) if $recurse;
+    }
+
+    return $self;
+}
+
+1;
@@ -0,0 +1,426 @@
+use 5.008;
+use strict;
+use warnings;
+
+# ABSTRACT: a low-level reader for EBML files
+package Parse::Matroska::Reader;
+
+use Parse::Matroska::Definitions qw{elem_by_hexid};
+use Parse::Matroska::Element;
+
+use Carp;
+use Scalar::Util qw{openhandle weaken};
+use IO::Handle;
+use IO::File;
+use List::Util qw{first};
+use Encode;
+
+use constant BIGINT_TRY => 'Pari,GMP,FastCalc';
+use Math::BigInt try => BIGINT_TRY;
+use Math::BigRat try => BIGINT_TRY;
+
+=head1 SYNOPSIS
+
+    use Parse::Matroska::Reader;
+    my $reader = Parse::Matroska::Reader->new($path);
+    $reader->close;
+    $reader->open(\$string_with_matroska_data);
+
+    my $elem = $reader->read_element;
+    print "Element ID: $elem->{elid}\n";
+    print "Element name: $elem->{name}\n";
+    if ($elem->{type} ne 'sub') {
+        print "Element value: $elem->get_value\n";
+    } else {
+        while (my $child = $elem->next_child) {
+            print "Child element: $child->{name}\n";
+        }
+    }
+    $reader->close;
+
+=head1 DESCRIPTION
+
+Reads EBML data, which is used in Matroska files.
+This is a low-level reader which is meant to be used as a backend
+for higher level readers. TODO: write the high level readers :)
+
+=head1 NOTE
+
+The API of this module is not yet considered stable.
+
+=method new
+
+Creates a new reader.
+Calls L</open($arg)> with its arguments if provided.
+
+=cut
+sub new {
+    my $class = shift;
+    my $self = {};
+    bless $self, $class;
+
+    $self->open(@_) if @_;
+    return $self;
+}
+
+=method open($arg)
+
+Creates the internal filehandle. The argument can be:
+
+=for :list
+* An open filehandle or L<IO::Handle> object.
+The filehandle is not C<dup()>ed, so calling L</close> in this
+object will close the given filehandle as well.
+* A scalar containing a path to a file.
+* On perl v5.14 or newer, a scalarref pointing to EBML data.
+For similar functionality in older perls, give an L<IO::String> object
+or the handle to an already C<open>ed scalarref.
+
+=cut
+sub open {
+    my ($self, $arg) = @_;
+    $self->{fh} = openhandle($arg) || IO::File->new($arg, "<:raw")
+        or croak "Can't open $arg: $!";
+}
+
+=method close
+
+Closes the internal filehandle.
+
+=cut
+sub close {
+    my ($self) = @_;
+    $self->{fh}->close;
+    delete $self->{fh};
+}
+
+# equivalent to $self->readlen(1), possibly faster
+sub _getc {
+    my ($self) = @_;
+    my $c = $self->{fh}->getc;
+    croak "Can't do read of length 1: $!" if !defined $c && $!;
+    return $c;
+}
+
+=method readlen($length)
+
+Reads C<$length> bytes from the internal filehandle.
+
+=cut
+sub readlen {
+    my ($self, $len) = @_;
+    my $data;
+    my $readlen = $self->{fh}->read($data, $len);
+    croak "Can't do read of length $len: $!"
+                 unless defined $readlen;
+    return $data;
+}
+
+# converts a byte string into an integer
+# we do so by converting the integer into a hex string (big-endian)
+# and then reading the hex-string into an integer
+sub _bin2int($) {
+    my ($bin) = @_;
+    # if the length is larger than 3
+    # the resulting integer might be larger than INT_MAX
+    if (length($bin) > 3) {
+        return Math::BigInt->from_hex(unpack("H*", $bin));
+    }
+    return hex(unpack("H*", $bin));
+}
+
+# creates a floating-point number with the given mantissa and exponent
+sub _ldexp {
+    my ($mantissa, $exponent) = @_;
+    my $r = new Math::BigRat($mantissa);
+    return $r * Math::BigRat->new(2)**$exponent;
+}
+
+# NOTE: the read_* functions are hard to read because they're ports
+# of even harder to read python functions.
+# TODO: make them readable
+
+=method read_id
+
+Reads an EBML ID atom in hexadecimal string format, suitable
+for passing to L<Parse::Matroska::Definitions/elem_by_hexid($id)>.
+
+=cut
+sub read_id {
+    my ($self) = @_;
+    my $t = $self->_getc;
+    return undef unless defined $t;
+    my $i = 0;
+    my $mask = 1<<7;
+
+    if (ord($t) == 0) {
+        croak "Matroska Syntax error: first byte of ID was \\0"
+    }
+    until (ord($t) & $mask) {
+        ++$i;
+        $mask >>= 1;
+    }
+    # return hex string of the bytes we just read
+    return unpack "H*", ($t . $self->readlen($i));
+}
+
+=method read_size
+
+Reads an EBML Data Size atom, which immediately follows
+an EBML ID atom.
+
+This returns an array consisting of:
+
+=for :list
+0. The length of the Data Size atom.
+1. The value encoded in the Data Size atom, which is the length of all the data following it.
+
+=cut
+sub read_size {
+    my ($self) = @_;
+    my $t = $self->_getc;
+    my $i = 0;
+    my $mask = 1<<7;
+
+    if (ord($t) == 0) {
+        croak "Matroska Syntax error: first byte of data size was \\0"
+    }
+    until (ord($t) & $mask) {
+        ++$i;
+        $mask >>= 1;
+    }
+    $t = $t & chr($mask-1); # strip length bits (keep only significant bits)
+    return ($i+1, _bin2int $t . $self->readlen($i));
+}
+
+=method read_str($length)
+
+Reads a string of length C<$length> bytes from the internal filehandle.
+The string is already L<Encode/decode>d from C<UTF-8>, which is the
+standard Matroska string encoding.
+
+=cut
+{
+    my $utf8 = find_encoding("UTF-8");
+    sub read_str {
+        my ($self, $length) = @_;
+        return $utf8->decode($self->readlen($length));
+    }
+}
+
+=method read_uint($length)
+
+Reads an unsigned integer of length C<$length> bytes
+from the internal filehandle.
+
+Returns a L<Math::BigInt> object if C<$length> is greater
+than 4.
+
+=cut
+sub read_uint {
+    my ($self, $length) = @_;
+    return _bin2int $self->readlen($length);
+}
+
+=method read_sint($length)
+
+Reads a signed integer of length C<$length> bytes
+from the internal filehandle.
+
+Returns a L<Math::BigInt> object if C<$length> is greater
+than 4.
+
+=cut
+sub read_sint {
+    my ($self, $length) = @_;
+    my $i = $self->read_uint($length);
+
+    # Apply 2's complement to the unsigned int
+    my $mask = int(2 ** ($length * 8 - 1));
+    # if the most significant bit is set...
+    if ($i & $mask) {
+        # subtract the MSB twice
+        $i -= 2 * $mask;
+    }
+    return $i;
+}
+
+=method read_float($length)
+
+Reads an IEEE floating point number of length C<$length>
+bytes from the internal filehandle.
+
+Only lengths C<4> and C<8> are supported (C C<float> and C<double>).
+
+=cut
+{
+    my $b1 = new Math::BigInt 1;
+
+    sub read_float {
+        my ($self, $length) = @_;
+        my $i = new Math::BigInt $self->read_uint($length)->bstr;
+        my $f;
+
+        # These evil expressions reinterpret an unsigned int as IEEE binary floats
+        if ($length == 4) {
+            $f = _ldexp(($i & ((1<<23) - 1)) + (1<<23), ($i>>23 & ((1<<8) - 1)) - 150);
+            $f = -$f if $i & ($b1<<31);
+        } elsif ($length == 8) {
+            $f = _ldexp(($i & (($b1<<52) - 1)) + ($b1<<52), ($i>>52 & ((1<<12) - 1)) - 1075);
+            $f = -$f if $i & ($b1<<63);
+        } else {
+            croak "Matroska Syntax error: unsupported IEEE float byte size $length";
+        }
+
+        return $f;
+    }
+}
+
+=method read_ebml_id($length)
+
+Reads an EBML ID when it's encoded as the data inside another
+EBML element, that is, when the enclosing element's C<type> is
+C<ebml_id>.
+
+This returns a hashref with the EBML element description as
+defined in L<Parse::Matroska::Definitions>.
+
+=cut
+sub read_ebml_id {
+    my ($self, $length) = @_;
+    return elem_by_hexid(unpack("H*", $self->readlen($length)));
+}
+
+=method skip($length)
+
+Skips C<$length> bytes in the internal filehandle.
+
+=cut
+sub skip {
+    my ($self, $len) = @_;
+    return if $self->{fh}->can('seek') && $self->{fh}->seek($len, 1);
+    $self->readlen($len);
+    return;
+}
+
+=method getpos
+
+Wrapper for L<IO::Seekable/$io-E<gt>getpos> in the internal filehandle.
+
+Returns undef if the internal filehandle can't C<getpos>.
+
+=cut
+sub getpos {
+    my ($self) = @_;
+    return undef unless $self->{fh}->can('getpos');
+    return $self->{fh}->getpos;
+}
+
+=method setpos($pos)
+
+Wrapper for L<IO::Seekable/$io-E<gt>setpos> in the internal filehandle.
+
+Returns C<undef> if the internal filehandle can't C<setpos>.
+
+Croaks if C<setpos> does not seek to the requested position,
+that is, if calling C<getpos> does not yield the same object
+as the C<$pos> argument.
+
+=cut
+sub setpos {
+    my ($self, $pos) = @_;
+    return undef unless $pos && $self->{fh}->can('setpos');
+
+    my $ret = $self->{fh}->setpos($pos);
+    croak "Cannot seek to correct position"
+        unless $self->getpos eq $pos;
+    return $ret;
+}
+
+=method read_element($read_bin)
+
+Reads a full EBML element from the internal filehandle.
+
+Returns a L<Parse::Matroska::Element> object initialized with
+the read data. If C<read_bin> is not present or is false, will
+delay-load the contents of C<binary> type elements, that is,
+they will only be loaded when calling C<get_value> on the
+returned L<Parse::Matroska::Element> object.
+
+Does not read the children of the element if its type is
+C<sub>. Look into the L<Parse::Matroska::Element> interface
+for details in how to read children elements.
+
+Pass a true C<$read_bin> if the stream being read is not
+seekable (C<getpos> is undef) and the contents of C<binary>
+elements is desired, otherwise seeking errors or internal
+filehandle corruption might occur.
+
+=cut
+sub read_element {
+    my ($self, $read_bin) = @_;
+    return undef if $self->{fh}->eof;
+
+    my $elem_pos = $self->getpos;
+
+    my $elid = $self->read_id;
+    my $elem_def = elem_by_hexid($elid);
+    my ($size_len, $content_len) = $self->read_size;
+    my $full_len = length($elid)/2 + $size_len + $content_len;
+
+    my $elem = Parse::Matroska::Element->new(
+        elid => $elid,
+        name => $elem_def && $elem_def->{name},
+        type => $elem_def && $elem_def->{valtype},
+        size_len => $size_len,
+        content_len => $content_len,
+        full_len => $full_len,
+        reader => $self,
+        elem_pos => $elem_pos,
+        data_pos => $self->getpos,
+        );
+    weaken($elem->{reader});
+
+    if (defined $elem_def) {
+        if ($elem->{type} eq 'sub') {
+            $elem->{value} = [];
+        } elsif ($elem->{type} eq 'str') {
+            $elem->{value} = $self->read_str($content_len);
+        } elsif ($elem->{type} eq 'ebml_id') {
+            $elem->{value} = $self->read_ebml_id($content_len);
+        } elsif ($elem->{type} eq 'uint') {
+            $elem->{value} = $self->read_uint($content_len);
+        } elsif ($elem->{type} eq 'sint') {
+            $elem->{value} = $self->read_sint($content_len);
+        } elsif ($elem->{type} eq 'float') {
+            $elem->{value} = $self->read_float($content_len);
+        } elsif ($elem->{type} eq 'skip') {
+            $self->skip($content_len);
+        } elsif ($elem->{type} eq 'binary') {
+            if ($read_bin) {
+                $elem->{value} = $self->readlen($content_len);
+            } else {
+                $self->skip($content_len);
+            }
+        } else {
+            die "Matroska Definition error: type $elem->{valtype} unknown"
+        }
+    } else {
+        $self->skip($content_len);
+    }
+    return $elem;
+}
+
+1;
+
+=head1 CAVEATS
+
+Children elements have to be processed as soon as an element
+with children is found, or their children ignored with
+L<Parse::Matroska::Element/skip>. Not doing so doesn't cause
+errors but results in an invalid structure, with constant C<0>
+depth.
+
+To work correctly in unseekable streams, either the contents
+of C<binary>-type elements has to be ignored or the C<read_bin>
+flag to C<read_element> has to be true.
@@ -0,0 +1,37 @@
+use strict;
+use warnings;
+
+# ABSTRACT: internally-used helper functions
+package Parse::Matroska::Utils;
+
+use Exporter;
+our @ISA       = qw{Exporter};
+our @EXPORT_OK = qw{uniq uncamelize};
+
+=method uniq(@array)
+
+The same as L<List::MoreUtils/"uniq LIST">.
+Included to avoid depending on it since it's
+not a core module.
+
+=cut
+sub uniq(@) {
+  my %seen;
+  return grep { !$seen{$_}++ } @_;
+}
+
+=method uncamelize($string)
+
+Converts a "StringLikeTHIS" into a
+"string_like_this".
+
+=cut
+sub uncamelize($) {
+    local $_ = shift;
+    # lc followed by UC: lc_UC
+    s/(?<=[a-z])([A-Z])/_\L$1/g;
+    # UC followed by two lc: _UClclc
+    s/([A-Z])(?=[a-z]{2})/_\L$1/g;
+    # strip leading _ that the second regexp might add; lowercase all
+    s/^_//; lc
+}
@@ -4,17 +4,16 @@ mpv lua scripts
 The lua scripts in this folder can be loaded on a one-time basis by
 adding the option

-    --script=/path/to/script.lua
+    --lua=/path/to/script.lua

 to mpv's command line.

-Where appropriate, they may also be placed in ~/.config/mpv/scripts/ from
-where they will be automatically loaded when mpv starts.
-
-This is only a small selection of internally maintained scripts. Some of them
-are just for testing mpv internals, or serve as examples. An extensive
-user-edited list of 3rd party scripts is available here:
-
-    https://github.com/mpv-player/mpv/wiki/User-Scripts
-
-(Anyone can add their own scripts to that list.)
+Unless otherwise specified, they are also suitable for inclusion in
+the `~/.mpv/lua` directory where they will be loaded every time mpv
+starts, obviating the need to load them with the above `--lua=...`
+argument. This is acceptable as they do only basic argument parsing
+and key-binding registration, until those bound keys are actually
+pressed.  They should therefore not interfere with normal playback
+(unless you have a conflicting user-defined key-binding, in which
+case, you may want to modify either the `mp.add_key_binding()` calls
+in the scripts, or your keybinding).
@@ -1,155 +0,0 @@
-- This script adds control to the dynamic range compression ffmpeg
-- filter including key bindings for adjusting parameters.
--
-- See https://ffmpeg.org/ffmpeg-filters.html#acompressor for explanation
-- of the parameteres.
-
-local mp = require 'mp'
-local options = require 'mp.options'
-
-local o = {
-	default_enable = false,
-	show_osd = true,
-	osd_timeout = 4000,
-	filter_label = mp.get_script_name(),
-
-	key_toggle = 'n',
-	key_increase_threshold = 'F1',
-	key_decrease_threshold = 'Shift+F1',
-	key_increase_ratio = 'F2',
-	key_decrease_ratio = 'Shift+F2',
-	key_increase_knee = 'F3',
-	key_decrease_knee = 'Shift+F3',
-	key_increase_makeup = 'F4',
-	key_decrease_makeup = 'Shift+F4',
-	key_increase_attack = 'F5',
-	key_decrease_attack = 'Shift+F5',
-	key_increase_release = 'F6',
-	key_decrease_release = 'Shift+F6',
-
-	default_threshold = -25.0,
-	default_ratio = 3.0,
-	default_knee = 2.0,
-	default_makeup = 8.0,
-	default_attack = 20.0,
-	default_release = 250.0,
-
-	step_threshold = -2.5,
-	step_ratio = 1.0,
-	step_knee = 1.0,
-	step_makeup = 1.0,
-	step_attack = 10.0,
-	step_release = 10.0,
-}
-options.read_options(o)
-
-local params = {
-	{ name = 'attack',    min=0.01, max=2000, hide_default=true,  dB=''   },
-	{ name = 'release',   min=0.01, max=9000, hide_default=true,  dB=''   },
-	{ name = 'threshold', min= -30, max=   0, hide_default=false, dB='dB' },
-	{ name = 'ratio',     min=   1, max=  20, hide_default=false, dB=''   },
-	{ name = 'knee',      min=   1, max=  10, hide_default=true,  dB='dB' },
-	{ name = 'makeup',    min=   0, max=  24, hide_default=false, dB='dB' },
-}
-
-local function parse_value(value)
-	-- Using nil here because tonumber differs between lua 5.1 and 5.2 when parsing fractions in combination with explicit base argument set to 10.
-	-- And we can't omit it because gsub returns 2 values which would get unpacked and cause more problems. Gotta love scripting languages.
-	return tonumber(value:gsub('dB$', ''), nil)
-end
-
-local function format_value(value, dB)
-	return string.format('%g%s', value, dB)
-end
-
-local function show_osd(filter)
-	if not o.show_osd then
-		return
-	end
-
-	if not filter.enabled then
-		mp.commandv('show-text', 'Dynamic range compressor: disabled', o.osd_timeout)
-		return
-	end
-
-	local pretty = {}
-	for _,param in ipairs(params) do
-		local value = parse_value(filter.params[param.name])
-		if not (param.hide_default and value == o['default_' .. param.name]) then
-			pretty[#pretty+1] = string.format('%s: %g%s', param.name:gsub("^%l", string.upper), value, param.dB)
-		end
-	end
-
-	if #pretty == 0 then
-		pretty = ''
-	else
-		pretty = '\n(' .. table.concat(pretty, ', ') .. ')'
-	end
-
-	mp.commandv('show-text', 'Dynamic range compressor: enabled' .. pretty, o.osd_timeout)
-end
-
-local function get_filter()
-	local af = mp.get_property_native('af', {})
-
-	for i = 1, #af do
-		if af[i].label == o.filter_label then
-			return af, i
-		end
-	end
-
-	af[#af+1] = {
-		name = 'acompressor',
-		label = o.filter_label,
-		enabled = false,
-		params = {},
-	}
-
-	for _,param in pairs(params) do
-		af[#af].params[param.name] = format_value(o['default_' .. param.name], param.dB)
-	end
-
-	return af, #af
-end
-
-local function toggle_acompressor()
-	local af, i = get_filter()
-	af[i].enabled = not af[i].enabled
-	mp.set_property_native('af', af)
-	show_osd(af[i])
-end
-
-local function update_param(name, increment)
-	for _,param in pairs(params) do
-		if param.name == string.lower(name) then
-			local af, i = get_filter()
-			local value = parse_value(af[i].params[param.name])
-			value = math.max(param.min, math.min(value + increment, param.max))
-			af[i].params[param.name] = format_value(value, param.dB)
-			af[i].enabled = true
-			mp.set_property_native('af', af)
-			show_osd(af[i])
-			return
-		end
-	end
-
-	mp.msg.error('Unknown parameter "' .. name .. '"')
-end
-
-mp.add_key_binding(o.key_toggle, "toggle-acompressor", toggle_acompressor)
-mp.register_script_message('update-param', update_param)
-
-for _,param in pairs(params) do
-	for direction,step in pairs({increase=1, decrease=-1}) do
-		mp.add_key_binding(o['key_' .. direction .. '_' .. param.name],
-		                   'acompressor-' .. direction .. '-' .. param.name,
-		                   function() update_param(param.name, step*o['step_' .. param.name]); end,
-		                   { repeatable = true })
-	end
-end
-
-if o.default_enable then
-	local af, i = get_filter()
-	af[i].enabled = true
-	mp.set_property_native('af', af)
-end
@@ -1,20 +0,0 @@
-- Handles the edge case where previous attempts to init audio have failed, but
-- might start working due to a newly added device. This is required in
-- particular for ao=wasapi, since the internal IMMNotificationClient code that
-- normally triggers ao-reload will not be running in this case.
-
-function do_reload()
-    mp.command("ao-reload")
-    reloading = nil
-end
-
-function on_audio_device_list_change()
-    if mp.get_property("current-ao") == "null" and not reloading then
-        mp.msg.verbose("audio-device-list changed: reloading audio")
-        -- avoid calling ao-reload too often
-        reloading = mp.add_timeout(0.5, do_reload)
-    end
-end
-
-mp.set_property("options/audio-fallback-to-null", "yes")
-mp.observe_property("audio-device-list", "native", on_audio_device_list_change)
@@ -1,8 +0,0 @@
-local utils = require("mp.utils")
-
-mp.observe_property("audio-device-list", "native", function(name, val)
-    print("Audio device list changed:")
-    for index, e in ipairs(val) do
-        print("  - '" .. e.name .. "' (" .. e.description .. ")")
-    end
-end)
@@ -21,7 +21,7 @@
 -- The default delay between insertion of the cropdetect and
 -- crop filters may be overridden by adding
 --
-- --script-opts=autocrop.detect_seconds=<number of seconds>
+-- --lua-opts=autocrop.detect_seconds=<number of seconds>
 --
 -- to mpv's arguments. This may be desirable to allow cropdetect more
 -- time to collect data.
@@ -42,11 +42,11 @@ function del_filter_if_present(label)
    -- error if the filter doesn't exist
    local vfs = mp.get_property_native("vf")
    for i,vf in pairs(vfs) do
-        if vf["label"] == label then
-            table.remove(vfs, i)
-            mp.set_property_native("vf", vfs)
-            return true
-        end
+	if vf["label"] == label then
+	    table.remove(vfs, i)
+	    mp.set_property_native("vf", vfs)
+	    return true
+	end
    end
    return false
 end
@@ -65,10 +65,10 @@ function autocrop_start()

    -- insert the cropdetect filter
    ret=mp.command(
-        string.format(
-            'vf add @%s:cropdetect=limit=%f:round=2:reset=0',
-            cropdetect_label, 24/255
-        )
+	string.format(
+	    'vf add @%s:lavfi=graph="cropdetect=limit=24:round=2:reset=0"',
+	    cropdetect_label
+	)
    )
    -- wait to gather data
    timer=mp.add_timeout(detect_seconds, do_crop)
@@ -77,17 +77,16 @@ end
 function do_crop()
    -- get the metadata
    local cropdetect_metadata = mp.get_property_native(
-        string.format("vf-metadata/%s", cropdetect_label)
+	string.format("vf-metadata/%s", cropdetect_label)
    )
-
    -- use it to crop if its valid
    if cropdetect_metadata then
-        if cropdetect_metadata["lavfi.cropdetect.w"]
-            and cropdetect_metadata["lavfi.cropdetect.h"]
-            and cropdetect_metadata["lavfi.cropdetect.x"]
-            and cropdetect_metadata["lavfi.cropdetect.y"]
-        then
-            mp.command(string.format("vf add @%s:lavfi-crop=w=%s:h=%s:x=%s:y=%s",
+	if cropdetect_metadata["lavfi.cropdetect.w"]
+	    and cropdetect_metadata["lavfi.cropdetect.h"]
+	    and cropdetect_metadata["lavfi.cropdetect.x"]
+	    and cropdetect_metadata["lavfi.cropdetect.y"]
+	then
+            mp.command(string.format("vf add @%s:crop=%s:%s:%s:%s",
                                     crop_label,
                                     cropdetect_metadata["lavfi.cropdetect.w"],
                                     cropdetect_metadata["lavfi.cropdetect.h"],
@@ -95,9 +94,9 @@ function do_crop()
                                     cropdetect_metadata["lavfi.cropdetect.y"]))
        else
            mp.msg.error(
-                "Got empty crop data. You might need to increase detect_seconds."
-            )
-        end
+		"Got empty crop data. You might need to increase detect_seconds."
+	    )
+	end
    else
        mp.msg.error(
            "No crop data. Was the cropdetect filter successfully inserted?"
@@ -1,156 +0,0 @@
-- This script uses the lavfi idet filter to automatically insert the
-- appropriate deinterlacing filter based on a short section of the
-- currently playing video.
--
-- It registers the key-binding ctrl+d, which when pressed, inserts the filters
-- ``vf=idet,lavfi-pullup,idet``. After 4 seconds, it removes these
-- filters and decides whether the content is progressive, interlaced, or
-- telecined and the interlacing field dominance.
--
-- Based on this information, it may set mpv's ``deinterlace`` property (which
-- usually inserts the yadif filter), or insert the ``pullup`` filter if the
-- content is telecined.  It also sets field dominance with lavfi setfield.
--
-- OPTIONS:
-- The default detection time may be overridden by adding
--
-- --script-opts=autodeint.detect_seconds=<number of seconds>
--
-- to mpv's arguments. This may be desirable to allow idet more
-- time to collect data.
--
-- To see counts of the various types of frames for each detection phase,
-- the verbosity can be increased with
--
-- --msg-level=autodeint=v
-
-require "mp.msg"
-
-script_name = mp.get_script_name()
-detect_label = string.format("%s-detect", script_name)
-pullup_label = string.format("%s", script_name)
-dominance_label = string.format("%s-dominance", script_name)
-ivtc_detect_label = string.format("%s-ivtc-detect", script_name)
-
-- number of seconds to gather cropdetect data
-detect_seconds = tonumber(mp.get_opt(string.format("%s.detect_seconds", script_name)))
-if not detect_seconds then
-    detect_seconds = 4
-end
-
-function del_filter_if_present(label)
-    -- necessary because mp.command('vf del @label:filter') raises an
-    -- error if the filter doesn't exist
-    local vfs = mp.get_property_native("vf")
-
-    for i,vf in pairs(vfs) do
-        if vf["label"] == label then
-            table.remove(vfs, i)
-            mp.set_property_native("vf", vfs)
-            return true
-        end
-    end
-    return false
-end
-
-local function add_vf(label, filter)
-    return mp.command(('vf add @%s:%s'):format(label, filter))
-end
-
-function start_detect()
-    -- exit if detection is already in progress
-    if timer then
-        mp.msg.warn("already detecting!")
-        return
-    end
-
-    mp.set_property("deinterlace","no")
-    del_filter_if_present(pullup_label)
-    del_filter_if_present(dominance_label)
-
-    -- insert the detection filters
-    if not (add_vf(detect_label, 'idet') and
-            add_vf(dominance_label, 'setfield=mode=auto') and
-            add_vf(pullup_label, 'lavfi-pullup') and
-            add_vf(ivtc_detect_label, 'idet')) then
-        mp.msg.error("failed to insert detection filters")
-        return
-    end
-
-    -- wait to gather data
-    timer = mp.add_timeout(detect_seconds, select_filter)
-end
-
-function stop_detect()
-    del_filter_if_present(detect_label)
-    del_filter_if_present(ivtc_detect_label)
-    timer = nil
-end
-
-progressive, interlaced_tff, interlaced_bff, interlaced = 0, 1, 2, 3, 4
-
-function judge(label)
-    -- get the metadata
-    local result = mp.get_property_native(string.format("vf-metadata/%s", label))
-    local num_tff          = tonumber(result["lavfi.idet.multiple.tff"])
-    local num_bff          = tonumber(result["lavfi.idet.multiple.bff"])
-    local num_progressive  = tonumber(result["lavfi.idet.multiple.progressive"])
-    local num_undetermined = tonumber(result["lavfi.idet.multiple.undetermined"])
-    local num_interlaced   = num_tff + num_bff
-    local num_determined   = num_interlaced + num_progressive
-
-    mp.msg.verbose(label.." progressive    = "..num_progressive)
-    mp.msg.verbose(label.." interlaced-tff = "..num_tff)
-    mp.msg.verbose(label.." interlaced-bff = "..num_bff)
-    mp.msg.verbose(label.." undetermined   = "..num_undetermined)
-
-    if num_determined < num_undetermined then
-        mp.msg.warn("majority undetermined frames")
-    end
-    if num_progressive > 20*num_interlaced then
-        return progressive
-    elseif num_tff > 10*num_bff then
-        return interlaced_tff
-    elseif num_bff > 10*num_tff then
-        return interlaced_bff
-    else
-        return interlaced
-    end
-end
-
-function select_filter()
-    -- handle the first detection filter results
-    local verdict = judge(detect_label)
-    local ivtc_verdict = judge(ivtc_detect_label)
-    local dominance = "auto"
-    if verdict == progressive then
-        mp.msg.info("progressive: doing nothing")
-        stop_detect()
-        del_filter_if_present(dominance_label)
-        del_filter_if_present(pullup_label)
-        return
-    else
-        if verdict == interlaced_tff then
-            dominance = "tff"
-            add_vf(dominance_label, 'setfield=mode='..dominance)
-        elseif verdict == interlaced_bff then
-            dominance = "bff"
-            add_vf(dominance_label, 'setfield=mode='..dominance)
-        else
-            del_filter_if_present(dominance_label)
-        end
-    end
-
-    -- handle the ivtc detection filter results
-    if ivtc_verdict == progressive then
-        mp.msg.info(string.format("telecined with %s field dominance: using pullup", dominance))
-        stop_detect()
-    else
-        mp.msg.info(string.format("interlaced with %s field dominance: setting deinterlace property", dominance))
-        del_filter_if_present(pullup_label)
-        mp.set_property("deinterlace","yes")
-        stop_detect()
-    end
-end
-
-mp.add_key_binding("ctrl+d", script_name, start_detect)
@@ -4,26 +4,8 @@
 -- alphabetically, and adds entries before and after the current file to
 -- the internal playlist. (It stops if the it would add an already existing
 -- playlist entry at the same position - this makes it "stable".)
-- Add at most 5000 * 2 files when starting a file (before + after).
-MAXENTRIES = 5000
-
-local options = require 'mp.options'
-
-o = {
-    disabled = false
-}
-options.read_options(o)
-
-function Set (t)
-    local set = {}
-    for _, v in pairs(t) do set[v] = true end
-    return set
-end
-
-EXTENSIONS = Set {
-    'mkv', 'avi', 'mp4', 'ogv', 'webm', 'rmvb', 'flv', 'wmv', 'mpeg', 'mpg', 'm4v', '3gp',
-    'mp3', 'wav', 'ogm', 'flac', 'm4a', 'wma', 'ogg', 'opus',
-}
+-- Add at most 5 * 2 files when starting a file (before + after).
+MAXENTRIES = 5

 mputils = require 'mp.utils'

@@ -32,92 +14,18 @@ function add_files_at(index, files)
    local oldcount = mp.get_property_number("playlist-count", 1)
    for i = 1, #files do
        mp.commandv("loadfile", files[i], "append")
-        mp.commandv("playlist-move", oldcount + i - 1, index + i - 1)
+        mp.commandv("playlist_move", oldcount + i - 1, index + i - 1)
    end
 end

-function get_extension(path)
-    match = string.match(path, "%.([^%.]+)$" )
-    if match == nil then
-        return "nomatch"
-    else
-        return match
-    end
-end
-
-table.filter = function(t, iter)
-    for i = #t, 1, -1 do
-        if not iter(t[i]) then
-            table.remove(t, i)
-        end
-    end
-end
-
-- splitbynum and alnumcomp from alphanum.lua (C) Andre Bogus
-- Released under the MIT License
-- http://www.davekoelle.com/files/alphanum.lua
-
-- split a string into a table of number and string values
-function splitbynum(s)
-    local result = {}
-    for x, y in (s or ""):gmatch("(%d*)(%D*)") do
-        if x ~= "" then table.insert(result, tonumber(x)) end
-        if y ~= "" then table.insert(result, y) end
-    end
-    return result
-end
-
-function clean_key(k)
-    k = (' '..k..' '):gsub("%s+", " "):sub(2, -2):lower()
-    return splitbynum(k)
-end
-
-- compare two strings
-function alnumcomp(x, y)
-    local xt, yt = clean_key(x), clean_key(y)
-    for i = 1, math.min(#xt, #yt) do
-        local xe, ye = xt[i], yt[i]
-        if type(xe) == "string" then ye = tostring(ye)
-        elseif type(ye) == "string" then xe = tostring(xe) end
-        if xe ~= ye then return xe < ye end
-    end
-    return #xt < #yt
-end
-
 function find_and_add_entries()
    local path = mp.get_property("path", "")
    local dir, filename = mputils.split_path(path)
-    if o.disabled or #dir == 0 then
+    if #dir == 0 then
        return
    end
-    local pl_count = mp.get_property_number("playlist-count", 1)
-    if (pl_count > 1 and autoload == nil) or
-       (pl_count == 1 and EXTENSIONS[string.lower(get_extension(filename))] == nil) then
-        return
-    else
-        autoload = true
-    end
-
    local files = mputils.readdir(dir, "files")
-    if files == nil then
-        return
-    end
-    table.filter(files, function (v, k)
-        if string.match(v, "^%.") then
-            return false
-        end
-        local ext = get_extension(v)
-        if ext == nil then
-            return false
-        end
-        return EXTENSIONS[string.lower(ext)]
-    end)
-    table.sort(files, alnumcomp)
-
-    if dir == "." then
-        dir = ""
-    end
-
+    table.sort(files)
    local pl = mp.get_property_native("playlist", {})
    local pl_current = mp.get_property_number("playlist-pos", 0) + 1
    -- Find the current pl entry (dir+"/"+filename) in the sorted dir list
@@ -131,36 +39,31 @@ function find_and_add_entries()
    if current == nil then
        return
    end
-
    local append = {[-1] = {}, [1] = {}}
-    for direction = -1, 1, 2 do -- 2 iterations, with direction = -1 and +1
+    for dir = -1, 1, 2 do -- 2 iterations, with dir = -1 and +1
        for i = 1, MAXENTRIES do
-            local file = files[current + i * direction]
-            local pl_e = pl[pl_current + i * direction]
+            local file = files[current + i * dir]
+            local pl_e = pl[pl_current + i * dir]
            if file == nil or file[1] == "." then
                break
            end
-
-            local filepath = dir .. file
            if pl_e then
                -- If there's a playlist entry, and it's the same file, stop.
-                if pl_e.filename == filepath then
+                if pl_e.filename == file then
                    break
                end
            end
-
-            if direction == -1 then
+            if dir == -1 then
                if pl_current == 1 then -- never add additional entries in the middle
                    mp.msg.info("Prepending " .. file)
-                    table.insert(append[-1], 1, filepath)
+                    table.insert(append[-1], 1, file)
                end
            else
                mp.msg.info("Adding " .. file)
-                table.insert(append[1], filepath)
+                table.insert(append[1], file)
            end
        end
    end
-
    add_files_at(pl_current + 1, append[1])
    add_files_at(pl_current, append[-1])
 end
@@ -20,9 +20,9 @@ pullup_label = string.format("%s-pullup", script_name)

 function pullup_on()
    for i,vf in pairs(mp.get_property_native('vf')) do
-        if vf['label'] == pullup_label then
-            return "yes"
-        end
+	if vf['label'] == pullup_label then
+	    return "yes"
+	end
    end
    return "no"
 end
@@ -0,0 +1,99 @@
+-- This script enables live control of the dynamic range compression
+-- (drc) audio filter while the video is playing back. This can be
+-- useful to avoid having to stop and restart mpv to adjust filter
+-- parameters. See the entry for "drc" under the "AUDIO FILTERS"
+-- section of the man page for a complete description of the filter.
+--
+-- This script registers the key-binding "\" to toggle the filter between 
+--
+-- * off
+-- * method=1 (single-sample smoothing)
+-- * method=2 (multi-sample smoothing)
+--
+-- It registers the keybindings ctrl+9/ctrl+0 to decrease/increase the
+-- target ampltiude. These keys will insert the filter at the default
+-- target amplitude of 0.25 if it was not previously present.
+--
+-- OSD feedback of the current filter state is displayed on pressing
+-- each bound key.
+
+script_name = mp.get_script_name()
+
+function print_state(params)
+    if params then
+	mp.osd_message(script_name..":\n"
+			   .."method = "..params["method"].."\n"
+			   .."target = "..params["target"])
+    else
+	mp.osd_message(script_name..":\noff")
+    end
+end
+
+function get_index_of_drc(afs)
+    for i,af in pairs(afs) do
+	if af["label"] == script_name then
+	    return i
+	end
+    end
+end
+
+function append_drc(afs)
+    afs[#afs+1] = {
+	name   = "drc",
+	label  = script_name,
+	params = {
+	    method = "1",
+	    target = "0.25"
+	}
+    }
+    print_state(afs[#afs]["params"])
+end
+
+function modify_or_create_af(fun)
+    afs = mp.get_property_native("af")
+    i = get_index_of_drc(afs)
+    if not i then
+	append_drc(afs)
+    else
+	fun(afs, i)
+    end
+    mp.set_property_native("af", afs)
+end
+
+function drc_toggle_method_handler()
+    modify_or_create_af(
+	function (afs, i)
+	    new_method=(afs[i]["params"]["method"]+1)%3
+	    if new_method == 0 then
+		table.remove(afs, i)
+		print_state(nil)
+	    else
+		afs[i]["params"]["method"] = tostring((afs[i]["params"]["method"])%2+1)
+		print_state(afs[i]["params"])
+	    end
+	end
+    )
+end
+
+function drc_scale_target(factor)
+    modify_or_create_af(
+	function (afs)
+	    afs[i]["params"]["target"] = tostring(afs[i]["params"]["target"]*factor)
+	    print_state(afs[i]["params"])
+	end
+    )
+end
+
+function drc_louder_handler()
+    drc_scale_target(2.0)
+end
+
+function drc_quieter_handler()
+    drc_scale_target(0.5)
+end
+
+-- toggle between off, method 1 and method 2 
+mp.add_key_binding("\\", "drc_toggle_method", drc_toggle_method_handler)
+-- increase or decrease target volume
+mp.add_key_binding("ctrl+9", "drc_quieter", drc_quieter_handler)
+mp.add_key_binding("ctrl+0", "drc_louder", drc_louder_handler)
@@ -1,22 +0,0 @@
-- Test script for property change notification mechanism.
-- Note that watching/reading some properties can be very expensive, or
-- require the player to synchronously wait on network (when playing
-- remote files), so you should in general only watch properties you
-- are interested in.
-
-local utils = require("mp.utils")
-
-function observe(name)
-    mp.observe_property(name, "native", function(name, val)
-        print("property '" .. name .. "' changed to '" ..
-              utils.to_string(val) .. "'")
-    end)
-end
-
-for i,name in ipairs(mp.get_property_native("property-list")) do
-    observe(name)
-end
-
-for i,name in ipairs(mp.get_property_native("options")) do
-    observe("options/" .. name)
-end
@@ -1,19 +0,0 @@
--makes mpv disable ontop when pausing and re-enable it again when resuming playback
--please note that this won't do anything if ontop was not enabled before pausing
-
-local was_ontop = false
-
-mp.observe_property("pause", "bool", function(name, value)
-    local ontop = mp.get_property_native("ontop")
-    if value then
-        if ontop then
-            mp.set_property_native("ontop", false)
-            was_ontop = true
-        end
-    else
-        if was_ontop and not ontop then
-            mp.set_property_native("ontop", true)
-        end
-        was_ontop = false
-    end
-end)
@@ -1,20 +0,0 @@
-- This script pauses playback when minimizing the window, and resumes playback
-- if it's brought back again. If the player was already paused when minimizing,
-- then try not to mess with the pause state.
-
-local did_minimize = false
-
-mp.observe_property("window-minimized", "bool", function(name, value)
-    local pause = mp.get_property_native("pause")
-    if value == true then
-        if pause == false then
-            mp.set_property_native("pause", true)
-            did_minimize = true
-        end
-    elseif value == false then
-        if did_minimize and (pause == true) then
-            mp.set_property_native("pause", false)
-        end
-        did_minimize = false
-    end
-end)
@@ -0,0 +1,169 @@
+#! /usr/bin/env perl
+
+# Generate C definitions for parsing Matroska files.
+
+use strict;
+use warnings;
+
+use FindBin;
+use lib "$FindBin::Bin/lib";
+use Parse::Matroska::Definitions;
+use Parse::Matroska::Reader;
+
+use Getopt::Long;
+use List::Util qw{max};
+
+my @global_elem_list = @Parse::Matroska::Definitions::global_elem_list;
+
+Getopt::Long::Configure(qw{auto_version auto_help});
+my %opt;
+GetOptions(\%opt,
+    "generate-header",
+    "generate-definitions",
+    "full",
+    );
+
+if ($opt{"generate-header"}) {
+    generate_c_header();
+} elsif ($opt{"generate-definitions"}) {
+    generate_c_definitions();
+} else {
+    for (@ARGV) {
+        my $reader = Parse::Matroska::Reader->new($_ eq '-' ? \*STDIN : $_) or die $!;
+        while (my $elem = $reader->read_element($_ eq '-')) {
+            process_elem($elem, $_ eq '-');
+        }
+    }
+}
+
+# Generate declarations for libmpdemux/ebml_types.h
+sub generate_c_header {
+    print "/* Generated by TOOLS/matroska.pl, do not edit manually */\n\n";
+
+    # Write a #define for the ElementID of each known element
+    for my $el (@global_elem_list) {
+        printf "#define %-40s 0x%s\n", $el->{definename}, $el->{elid};
+    }
+    print "\n";
+
+    # Define a struct for each ElementID that has child elements
+    for my $el (@global_elem_list) {
+        next unless $el->{subelements};
+        print "\nstruct $el->{structname} {\n";
+
+        # Figure out the length of the longest variable name
+        # Used for pretty-printing in the next step
+        my $l = max(map { length $_->{valname} } values %{$el->{subelements}});
+
+        # Output each variable, with pointers for array (multiple) elements
+        for my $subel (sort { $a->{definename} cmp $b->{definename} } values %{$el->{subelements}}) {
+            printf "    %-${l}s %s%s;\n",
+                $subel->{valname}, $subel->{multiple}?'*':' ', $subel->{fieldname};
+        }
+        print "\n";
+
+        # Output a counter variable for each element
+        # (presence/absence for scalars, item count for arrays)
+        for my $subel (values %{$el->{subelements}}) {
+            print "    int n_$subel->{fieldname};\n"
+        }
+        print "};\n";
+    }
+    print "\n";
+
+    # Output extern references for ebml_elem_desc structs for each of the elements
+    # These are defined by generate_c_definitions
+    for my $el (@global_elem_list) {
+        next unless $el->{subelements};
+        print "extern const struct ebml_elem_desc $el->{structname}_desc;\n";
+    }
+    print "\n";
+
+    # Output the max number of sub-elements a known element might have
+    printf "#define MAX_EBML_SUBELEMENTS %d\n",
+        max(map { scalar keys %{$_->{subelements}} }
+            grep { $_->{subelements} } @global_elem_list);
+}
+
+# Generate definitions for libmpdemux/ebml_defs.c
+sub generate_c_definitions {
+    print "/* Generated by TOOLS/matroska.pl, do not edit manually */\n\n";
+    # ebml_defs.c uses macros declared in ebml.c
+    for my $el (@global_elem_list) {
+        print "\n";
+        if ($el->{subelements}) {
+            # set N for the next macros
+            print "#define N $el->{fieldname}\n";
+
+            # define a struct ebml_$N_desc and gets ready to define fields
+            # this secretly opens two scopes; hence the }}; at the end
+            print "E_S(\"$el->{name}\", ".scalar(keys %{$el->{subelements}}).")\n";
+
+            # define a field for each subelement
+            # also does lots of macro magic, but doesn't open a scope
+            for my $subel (sort { $a->{definename} cmp $b->{definename} } values %{$el->{subelements}}) {
+                print "F($subel->{definename}, $subel->{fieldname}, ".
+                    ($subel->{multiple}?'1':'0').")\n";
+            }
+            # close the struct
+            print "}};\n";
+
+            # unset N since we've used it
+            print "#undef N\n";
+        } else {
+            print "E(\"$el->{name}\", $el->{fieldname}, $el->{ebmltype})\n";
+        }
+    }
+}
+
+sub repr {
+    my @ret;
+    foreach (@_) {
+        if (/'/) {
+            s/"/\\"/g;
+            push @ret, "\"$_\"";
+        } else {
+            push @ret, "'$_'";
+        }
+    }
+    return @ret if wantarray;
+    return pop @ret if defined wantarray;
+    return;
+}
+
+sub process_elem {
+    my ($elem, $read_bin) = @_;
+    unless ($opt{full}) {
+        if ($elem->{name} eq 'Cluster' || $elem->{name} eq 'Cues') {
+            $elem->skip;
+            return;
+        }
+    }
+    die unless $elem;
+
+    if ($elem->{type} ne 'skip') {
+        print "$elem->{depth} $elem->{elid} $elem->{name} size: $elem->{content_len} value: ";
+    }
+
+    if ($elem->{type} eq 'sub') {
+        print "subelements:\n";
+        while (my $chld = $elem->next_child($read_bin)) {
+            process_elem($chld);
+        }
+    } elsif ($elem->{type} eq 'binary') {
+        my $t = "<skipped $elem->{content_len} bytes>";
+        if ($elem->{content_len} < 20) {
+            $t = unpack "H*", $elem->get_value;
+        }
+        print "binary $t\n";
+        delete $elem->{value};
+    } elsif ($elem->{type} eq 'ebml_id') {
+        print "binary $elem->{value}->{elid} (".($elem->{value}->{name}||"UNKNOWN").")\n";
+    } elsif ($elem->{type} eq 'skip') {
+        # skip
+    } elsif ($elem->{type} eq 'str') {
+        print "string ". repr($elem->get_value) . "\n";
+    } else {
+        print "$elem->{type} ". $elem->get_value ."\n";
+    }
+}
@@ -1,477 +0,0 @@
-#!/usr/bin/env python3
-"""
-Generate C definitions for parsing Matroska files.
-Can also be used to directly parse Matroska files and display their contents.
-"""
-
-#
-# This file is part of mpv.
-#
-# mpv is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# mpv is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# for compatibility with Python 2.x
-from __future__ import print_function
-
-elements_ebml = (
-    'EBML, 1a45dfa3, sub', (
-        'EBMLVersion, 4286, uint',
-        'EBMLReadVersion, 42f7, uint',
-        'EBMLMaxIDLength, 42f2, uint',
-        'EBMLMaxSizeLength, 42f3, uint',
-        'DocType, 4282, str',
-        'DocTypeVersion, 4287, uint',
-        'DocTypeReadVersion, 4285, uint',
-    ),
-
-    'CRC32, bf, binary',
-    'Void, ec, binary',
-)
-
-elements_matroska = (
-    'Segment, 18538067, sub', (
-
-        'SeekHead*, 114d9b74, sub', (
-            'Seek*, 4dbb, sub', (
-                'SeekID, 53ab, ebml_id',
-                'SeekPosition, 53ac, uint',
-            ),
-        ),
-
-        'Info*, 1549a966, sub', (
-            'SegmentUID, 73a4, binary',
-            'PrevUID, 3cb923, binary',
-            'NextUID, 3eb923, binary',
-            'TimecodeScale, 2ad7b1, uint',
-            'DateUTC, 4461, sint',
-            'Title, 7ba9, str',
-            'MuxingApp, 4d80, str',
-            'WritingApp, 5741, str',
-            'Duration, 4489, float',
-        ),
-
-        'Cluster*, 1f43b675, sub', (
-            'Timecode, e7, uint',
-            'BlockGroup*, a0, sub', (
-                'Block, a1, binary',
-                'BlockDuration, 9b, uint',
-                'ReferenceBlock*, fb, sint',
-                'DiscardPadding,  75A2, sint',
-                'BlockAdditions, 75A1, sub', (
-                    'BlockMore*, A6, sub', (
-                        'BlockAddID, EE, uint',
-                        'BlockAdditional, A5, binary',
-                    ),
-                ),
-            ),
-            'SimpleBlock*, a3, binary',
-        ),
-
-        'Tracks*, 1654ae6b, sub', (
-            'TrackEntry*, ae, sub', (
-                'TrackNumber, d7, uint',
-                'TrackUID, 73c5, uint',
-                'TrackType, 83, uint',
-                'FlagEnabled, b9, uint',
-                'FlagDefault, 88, uint',
-                'FlagForced, 55aa, uint',
-                'FlagLacing, 9c, uint',
-                'MinCache, 6de7, uint',
-                'MaxCache, 6df8, uint',
-                'DefaultDuration, 23e383, uint',
-                'TrackTimecodeScale, 23314f, float',
-                'MaxBlockAdditionID, 55ee, uint',
-                'Name, 536e, str',
-                'Language, 22b59c, str',
-                'CodecID, 86, str',
-                'CodecPrivate, 63a2, binary',
-                'CodecName, 258688, str',
-                'CodecDecodeAll, aa, uint',
-                'CodecDelay, 56aa, uint',
-                'SeekPreRoll, 56bb, uint',
-                'Video, e0, sub', (
-                    'FlagInterlaced, 9a, uint',
-                    'PixelWidth, b0, uint',
-                    'PixelHeight, ba, uint',
-                    'DisplayWidth, 54b0, uint',
-                    'DisplayHeight, 54ba, uint',
-                    'DisplayUnit, 54b2, uint',
-                    'FrameRate, 2383e3, float',
-                    'ColourSpace, 2eb524, binary',
-                    'StereoMode, 53b8, uint',
-                    'Colour, 55b0, sub', (
-                        'MatrixCoefficients,      55B1, uint',
-                        'BitsPerChannel,          55B2, uint',
-                        'ChromaSubsamplingHorz,   55B3, uint',
-                        'ChromaSubsamplingVert,   55B4, uint',
-                        'CbSubsamplingHorz,       55B5, uint',
-                        'CbSubsamplingVert,       55B6, uint',
-                        'ChromaSitingHorz,        55B7, uint',
-                        'ChromaSitingVert,        55B8, uint',
-                        'Range,                   55B9, uint',
-                        'TransferCharacteristics, 55BA, uint',
-                        'Primaries,               55BB, uint',
-                        'MaxCLL,                  55BC, uint',
-                        'MaxFALL,                 55BD, uint',
-                        'MasteringMetadata,       55D0, sub', (
-                            'PrimaryRChromaticityX,   55D1, float',
-                            'PrimaryRChromaticityY,   55D2, float',
-                            'PrimaryGChromaticityX,   55D3, float',
-                            'PrimaryGChromaticityY,   55D4, float',
-                            'PrimaryBChromaticityX,   55D5, float',
-                            'PrimaryBChromaticityY,   55D6, float',
-                            'WhitePointChromaticityX, 55D7, float',
-                            'WhitePointChromaticityY, 55D8, float',
-                            'LuminanceMax,            55D9, float',
-                            'LuminanceMin,            55DA, float',
-                        ),
-                    ),
-                    'Projection, 7670, sub', (
-                        'ProjectionType, 7671, uint',
-                        'ProjectionPrivate, 7672, binary',
-                        'ProjectionPoseYaw, 7673, float',
-                        'ProjectionPosePitch, 7674, float',
-                        'ProjectionPoseRoll, 7675, float',
-                    ),
-                ),
-                'Audio, e1, sub', (
-                    'SamplingFrequency, b5, float',
-                    'OutputSamplingFrequency, 78b5, float',
-                    'Channels, 9f, uint',
-                    'BitDepth, 6264, uint',
-                ),
-                'ContentEncodings, 6d80, sub', (
-                    'ContentEncoding*, 6240, sub', (
-                        'ContentEncodingOrder, 5031, uint',
-                        'ContentEncodingScope, 5032, uint',
-                        'ContentEncodingType, 5033, uint',
-                        'ContentCompression, 5034, sub', (
-                            'ContentCompAlgo, 4254, uint',
-                            'ContentCompSettings, 4255, binary',
-                        ),
-                    ),
-                ),
-            ),
-        ),
-
-        'Cues, 1c53bb6b, sub', (
-            'CuePoint*, bb, sub', (
-                'CueTime, b3, uint',
-                'CueTrackPositions*, b7, sub', (
-                    'CueTrack, f7, uint',
-                    'CueClusterPosition, f1, uint',
-                    'CueRelativePosition, f0, uint',
-                    'CueDuration, b2, uint',
-                ),
-            ),
-        ),
-
-        'Attachments, 1941a469, sub', (
-            'AttachedFile*, 61a7, sub', (
-                'FileDescription, 467e, str',
-                'FileName, 466e, str',
-                'FileMimeType, 4660, str',
-                'FileData, 465c, binary',
-                'FileUID, 46ae, uint',
-            ),
-        ),
-
-        'Chapters, 1043a770, sub', (
-            'EditionEntry*, 45b9, sub', (
-                'EditionUID, 45bc, uint',
-                'EditionFlagHidden, 45bd, uint',
-                'EditionFlagDefault, 45db, uint',
-                'EditionFlagOrdered, 45dd, uint',
-                'ChapterAtom*, b6, sub', (
-                    'ChapterUID, 73c4, uint',
-                    'ChapterTimeStart, 91, uint',
-                    'ChapterTimeEnd, 92, uint',
-                    'ChapterFlagHidden, 98, uint',
-                    'ChapterFlagEnabled, 4598, uint',
-                    'ChapterSegmentUID, 6e67, binary',
-                    'ChapterSegmentEditionUID, 6ebc, uint',
-                    'ChapterDisplay*, 80, sub', (
-                        'ChapString, 85, str',
-                        'ChapLanguage*, 437c, str',
-                        'ChapCountry*, 437e, str',
-                    ),
-                ),
-            ),
-        ),
-        'Tags*, 1254c367, sub', (
-            'Tag*, 7373, sub', (
-                'Targets, 63c0, sub', (
-                    'TargetTypeValue, 68ca, uint',
-                    'TargetTrackUID, 63c5, uint',
-                    'TargetEditionUID, 63c9, uint',
-                    'TargetChapterUID, 63c4, uint',
-                    'TargetAttachmentUID, 63c6, uint',
-                 ),
-                'SimpleTag*, 67c8, sub', (
-                    'TagName, 45a3, str',
-                    'TagLanguage, 447a, str',
-                    'TagString, 4487, str'
-                ),
-            ),
-        ),
-    ),
-)
-
-
-import sys
-from math import ldexp
-from binascii import hexlify
-
-def byte2num(s):
-    return int(hexlify(s), 16)
-
-class EOF(Exception): pass
-
-def camelcase_to_words(name):
-    parts = []
-    start = 0
-    for i in range(1, len(name)):
-        if name[i].isupper() and (name[i-1].islower() or
-                                  name[i+1:i+2].islower()):
-            parts.append(name[start:i])
-            start = i
-    parts.append(name[start:])
-    return '_'.join(parts).lower()
-
-class MatroskaElement(object):
-
-    def __init__(self, name, elid, valtype, namespace):
-        self.name = name
-        self.definename = '{0}_ID_{1}'.format(namespace, name.upper())
-        self.fieldname = camelcase_to_words(name)
-        self.structname = 'ebml_' + self.fieldname
-        self.elid = elid
-        self.valtype = valtype
-        if valtype == 'sub':
-            self.ebmltype = 'EBML_TYPE_SUBELEMENTS'
-            self.valname = 'struct ' + self.structname
-        else:
-            self.ebmltype = 'EBML_TYPE_' + valtype.upper()
-            try:
-                self.valname = {'uint': 'uint64_t', 'str': 'char *',
-                                'binary': 'bstr', 'ebml_id': 'uint32_t',
-                                'float': 'double', 'sint': 'int64_t',
-                                }[valtype]
-            except KeyError:
-                raise SyntaxError('Unrecognized value type ' + valtype)
-        self.subelements = ()
-
-    def add_subelements(self, subelements):
-        self.subelements = subelements
-        self.subids = set(x[0].elid for x in subelements)
-
-elementd = {}
-elementlist = []
-def parse_elems(l, namespace):
-    subelements = []
-    for el in l:
-        if isinstance(el, str):
-            name, hexid, eltype = [x.strip() for x in el.split(',')]
-            hexid = hexid.lower()
-            multiple = name.endswith('*')
-            name = name.strip('*')
-            new = MatroskaElement(name, hexid, eltype, namespace)
-            elementd[hexid] = new
-            elementlist.append(new)
-            subelements.append((new, multiple))
-        else:
-            new.add_subelements(parse_elems(el, namespace))
-    return subelements
-
-parse_elems(elements_ebml, 'EBML')
-parse_elems(elements_matroska, 'MATROSKA')
-
-def printf(out, *args):
-    out.write(u' '.join([str(x) for x in args]))
-    out.write(u'\n')
-
-def generate_C_header(out):
-    printf(out, '// Generated by TOOLS/matroska.py, do not edit manually')
-    printf(out)
-
-    for el in elementlist:
-        printf(out, '#define {0.definename:40} 0x{0.elid}'.format(el))
-
-    printf(out)
-
-    for el in reversed(elementlist):
-        if not el.subelements:
-            continue
-        printf(out)
-        printf(out, 'struct {0.structname} {{'.format(el))
-        l = max(len(subel.valname) for subel, multiple in el.subelements)+1
-        for subel, multiple in el.subelements:
-            printf(out, '    {e.valname:{l}} {star}{e.fieldname};'.format(
-                        e=subel, l=l, star=' *'[multiple]))
-        printf(out)
-        for subel, multiple in el.subelements:
-            printf(out, '    int  n_{0.fieldname};'.format(subel))
-        printf(out, '};')
-
-    for el in elementlist:
-        if not el.subelements:
-            continue
-        printf(out, 'extern const struct ebml_elem_desc {0.structname}_desc;'.format(el))
-
-    printf(out)
-    printf(out, '#define MAX_EBML_SUBELEMENTS', max(len(el.subelements)
-                                                    for el in elementlist))
-
-
-def generate_C_definitions(out):
-    printf(out, '// Generated by TOOLS/matroska.py, do not edit manually')
-    printf(out)
-    for el in reversed(elementlist):
-        printf(out)
-        if el.subelements:
-            printf(out, '#define N', el.fieldname)
-            printf(out, 'E_S("{0}", {1})'.format(el.name, len(el.subelements)))
-            for subel, multiple in el.subelements:
-                printf(out, 'F({0.definename}, {0.fieldname}, {1})'.format(
-                            subel, int(multiple)))
-            printf(out, '}};')
-            printf(out, '#undef N')
-        else:
-            printf(out, 'E("{0.name}", {0.fieldname}, {0.ebmltype})'.format(el))
-
-def read(s, length):
-    t = s.read(length)
-    if len(t) != length:
-        raise EOF
-    return t
-
-def read_id(s):
-    t = read(s, 1)
-    i = 0
-    mask = 128
-    if ord(t) == 0:
-        raise SyntaxError
-    while not ord(t) & mask:
-        i += 1
-        mask >>= 1
-    t += read(s, i)
-    return t
-
-def read_vint(s):
-    t = read(s, 1)
-    i = 0
-    mask = 128
-    if ord(t) == 0:
-        raise SyntaxError
-    while not ord(t) & mask:
-        i += 1
-        mask >>= 1
-    t = bytes((ord(t) & (mask - 1),))
-    t += read(s, i)
-    return i+1, byte2num(t)
-
-def read_str(s, length):
-    return read(s, length)
-
-def read_uint(s, length):
-    t = read(s, length)
-    return byte2num(t)
-
-def read_sint(s, length):
-    i = read_uint(s, length)
-    mask = 1 << (length * 8 - 1)
-    if i & mask:
-        i -= 2 * mask
-    return i
-
-def read_float(s, length):
-    t = read(s, length)
-    i = byte2num(t)
-    if length == 4:
-        f = ldexp((i & 0x7fffff) + (1 << 23), (i >> 23 & 0xff) - 150)
-        if i & (1 << 31):
-            f = -f
-    elif length == 8:
-        f = ldexp((i & ((1 << 52) - 1)) + (1 << 52), (i >> 52 & 0x7ff) - 1075)
-        if i & (1 << 63):
-            f = -f
-    else:
-        raise SyntaxError
-    return f
-
-def parse_one(s, depth, parent, maxlen):
-    elid = hexlify(read_id(s)).decode('ascii')
-    elem = elementd.get(elid)
-    size, length = read_vint(s)
-    this_length = len(elid) / 2 + size + length
-    if elem is not None:
-        if elem.valtype != 'skip':
-            print("    " * depth, '[' + elid + ']', elem.name, 'size:', length, 'value:', end=' ')
-        if elem.valtype == 'sub':
-            print('subelements:')
-            while length > 0:
-                length -= parse_one(s, depth + 1, elem, length)
-            if length < 0:
-                raise SyntaxError
-        elif elem.valtype == 'str':
-            print('string', repr(read_str(s, length).decode('utf8', 'replace')))
-        elif elem.valtype in ('binary', 'ebml_id'):
-            t = read_str(s, length)
-            dec = ''
-            if elem.valtype == 'ebml_id':
-                idelem = elementd.get(hexlify(t).decode('ascii'))
-                if idelem is None:
-                    dec = '(UNKNOWN)'
-                else:
-                    dec = '({0.name})'.format(idelem)
-            if len(t) < 20:
-                t = hexlify(t).decode('ascii')
-            else:
-                t = '<{0} bytes>'.format(len(t))
-            print('binary', t, dec)
-        elif elem.valtype == 'uint':
-            print('uint', read_uint(s, length))
-        elif elem.valtype == 'sint':
-            print('sint', read_sint(s, length))
-        elif elem.valtype == 'float':
-            print('float', read_float(s, length))
-        elif elem.valtype == 'skip':
-            read(s, length)
-        else:
-            raise NotImplementedError
-    else:
-        print("    " * depth, '[' + elid + '] Unknown element! size:', length)
-        read(s, length)
-    return this_length
-
-if __name__ == "__main__":
-    def parse_toplevel(s):
-        parse_one(s, 0, None, 1 << 63)
-
-    if sys.argv[1] == '--generate-header':
-        generate_C_header(sys.stdout)
-    elif sys.argv[1] == '--generate-definitions':
-        generate_C_definitions(sys.stdout)
-    else:
-        if sys.version_info.major < 3:
-            raise Exception("Dumping requires Python 3.")
-        s = open(sys.argv[1], "rb")
-        while 1:
-            start = s.tell()
-            try:
-                parse_toplevel(s)
-            except EOF:
-                if s.tell() != start:
-                    raise Exception("Unexpected end of file")
-                break
@@ -1,6 +0,0 @@
-StartChar: .notdef
-Encoding: 65536 -1 0
-Width: 400
-Flags: W
-LayerCount: 2
-EndChar
@@ -1,77 +0,0 @@
-SplineFontDB: 3.0
-FontName: mpv-osd-symbols-Regular
-FullName: mpv-osd-symbols Regular
-FamilyName: mpv-osd-symbols
-Weight: Normal
-Copyright: This is generated file.
-Version: 001.000
-ItalicAngle: 0
-UnderlinePosition: -133
-UnderlineWidth: 50
-Ascent: 800
-Descent: 200
-InvalidEm: 0
-sfntRevision: 0x00010000
-LayerCount: 2
-Layer: 0 0 "Back" 1
-Layer: 1 0 "Fore" 0
-XUID: [1021 879 -1597228462 15927]
-StyleMap: 0x0040
-FSType: 8
-OS2Version: 3
-OS2_WeightWidthSlopeOnly: 0
-OS2_UseTypoMetrics: 0
-CreationTime: 1408646554
-ModificationTime: 1492879730
-PfmFamily: 81
-TTFWeight: 400
-TTFWidth: 5
-LineGap: 0
-VLineGap: 0
-Panose: 0 0 5 0 0 0 0 0 0 0
-OS2TypoAscent: 800
-OS2TypoAOffset: 0
-OS2TypoDescent: -200
-OS2TypoDOffset: 0
-OS2TypoLinegap: 90
-OS2WinAscent: 1000
-OS2WinAOffset: 0
-OS2WinDescent: 200
-OS2WinDOffset: 0
-HheadAscent: 1000
-HheadAOffset: 0
-HheadDescent: -200
-HheadDOffset: 0
-OS2SubXSize: 650
-OS2SubYSize: 600
-OS2SubXOff: 0
-OS2SubYOff: 75
-OS2SupXSize: 650
-OS2SupYSize: 600
-OS2SupXOff: 0
-OS2SupYOff: 350
-OS2StrikeYSize: 50
-OS2StrikeYPos: 220
-OS2Vendor: 'PfEd'
-OS2CodePages: 00000001.00000000
-OS2UnicodeRanges: 00000000.00000000.00000000.00000000
-DEI: 91125
-LangName: 1033 "" "" "Regular" "1.000;PfEd;mpv-osd-symbols-Regular" "mpv-osd-symbols" "Version 1.000;PS 001.000;hotconv 1.0.70;makeotf.lib2.5.58329"
-Encoding: UnicodeBmp
-UnicodeInterp: none
-NameList: AGL For New Fonts
-DisplaySize: -72
-AntiAlias: 1
-FitToEm: 0
-WinInfo: 57600 8 2
-BeginPrivate: 8
-BlueValues 31 [-10 0 640 650 720 730 800 810]
-BlueScale 5 0.037
-BlueShift 1 0
-BlueFuzz 1 0
-StdHW 4 [65]
-StdVW 4 [65]
-StemSnapH 8 [65 800]
-StemSnapV 8 [65 150]
-EndPrivate
-EndSplineFont
@@ -1,16 +0,0 @@
-StartChar: uniE001
-Encoding: 57345 57345 1
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 780 20G<200 200>
-VStem: 200 375<400 400 400 800>
-LayerCount: 2
-Fore
-SplineSet
-575 400 m 1
- 200 0 l 1
- 200 800 l 1
- 575 400 l 1
-EndSplineSet
-EndChar
@@ -1,22 +0,0 @@
-StartChar: uniE002
-Encoding: 57346 57346 2
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 0 800<200 350 200 350 200 500 500 650>
-VStem: 200 150<0 800 0 800> 500 150<0 800 0 800>
-LayerCount: 2
-Fore
-SplineSet
-350 800 m 1
- 350 0 l 1
- 200 0 l 1
- 200 800 l 1
- 350 800 l 1
-650 800 m 1
- 650 0 l 1
- 500 0 l 1
- 500 800 l 1
- 650 800 l 1
-EndSplineSet
-EndChar
@@ -1,17 +0,0 @@
-StartChar: uniE003
-Encoding: 57347 57347 3
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 0 720<110 775 110 775>
-VStem: 110 665<0 720 0 720>
-LayerCount: 2
-Fore
-SplineSet
-775 720 m 1
- 775 0 l 1
- 110 0 l 1
- 110 720 l 1
- 775 720 l 1
-EndSplineSet
-EndChar
@@ -1,20 +0,0 @@
-StartChar: uniE004
-Encoding: 57348 57348 4
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 780 20G<423 423 813 813>
-VStem: 48 765<400 400>
-LayerCount: 2
-Fore
-SplineSet
-423 800 m 1
- 423 0 l 1
- 48 400 l 1
- 423 800 l 1
-813 800 m 1
- 813 0 l 1
- 438 400 l 1
- 813 800 l 1
-EndSplineSet
-EndChar
@@ -1,20 +0,0 @@
-StartChar: uniE005
-Encoding: 57349 57349 5
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 780 20G<95 95 485 485>
-VStem: 95 765<400 400 400 800 400 800>
-LayerCount: 2
-Fore
-SplineSet
-470 400 m 1
- 95 0 l 1
- 95 800 l 1
- 470 400 l 1
-860 400 m 1
- 485 0 l 1
- 485 800 l 1
- 860 400 l 1
-EndSplineSet
-EndChar
@@ -1,47 +0,0 @@
-StartChar: uniE006
-Encoding: 57350 57350 6
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: -10 11<396 461 396 543> 196 171<397 461 396 462> 401 31 801 9<397 462 397 397>
-VStem: 20 9<369 434 369 513> 224 173<369 408 367 434 367 434> 363 34 397 65<367 404 367 408 367 404 606 801> 462 173<368 404 404 404> 830 10<368 433 433 433>
-LayerCount: 2
-Fore
-SplineSet
-430 810 m 0x9940
- 656 810 840 626 840 400 c 0
- 840 174 656 -10 430 -10 c 0
- 204 -10 20 174 20 400 c 0
- 20 626 204 810 430 810 c 0x9940
-397 606 m 1x5280
- 462 606 l 1
- 462 801 l 1
- 397 801 l 1
- 397 606 l 1x5280
-462 367 m 1
- 462 404 l 1
- 710 627 l 1
- 683 657 l 1
- 439 437 l 1
- 363 592 l 1
- 318 570 l 1x4280
- 397 408 l 1
- 397 367 l 1x44
- 462 367 l 1
-224 434 m 1
- 29 434 l 1
- 29 369 l 1
- 224 369 l 1
- 224 434 l 1
-830 368 m 1
- 830 433 l 1
- 635 433 l 1
- 635 368 l 1
- 830 368 l 1
-461 196 m 1
- 396 196 l 1
- 396 1 l 1
- 461 1 l 1
- 461 196 l 1
-EndSplineSet
-EndChar
@@ -1,21 +0,0 @@
-StartChar: uniE007
-Encoding: 57351 57351 7
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: -10 80<339 430 339 543> 730 80<339 430>
-VStem: 20 80<309 491 309 513>
-LayerCount: 2
-Fore
-SplineSet
-430 -10 m 0
- 204 -10 20 174 20 400 c 0
- 20 626 204 810 430 810 c 0
- 656 810 840 626 840 400 c 0
- 840 174 656 -10 430 -10 c 0
-430 70 m 1
- 430 730 l 1
- 248 730 100 582 100 400 c 0
- 100 218 248 70 430 70 c 1
-EndSplineSet
-EndChar
@@ -1,37 +0,0 @@
-StartChar: uniE008
-Encoding: 57352 57352 8
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: -10 80<339 521 339 543> 240 160<269 313 546 590> 480 160<408 452> 730 80<339 521>
-VStem: 20 80<309 491 309 513> 211 160<298 342> 350 160<538 582> 488 160<298 342> 760 80<309 491>
-LayerCount: 2
-Fore
-SplineSet
-430 -10 m 0xfa80
- 204 -10 20 174 20 400 c 0
- 20 626 204 810 430 810 c 0
- 656 810 840 626 840 400 c 0
- 840 174 656 -10 430 -10 c 0xfa80
-430 70 m 0
- 612 70 760 218 760 400 c 0
- 760 582 612 730 430 730 c 0
- 248 730 100 582 100 400 c 0
- 100 218 248 70 430 70 c 0
-430 480 m 0
- 386 480 350 516 350 560 c 0
- 350 604 386 640 430 640 c 0
- 474 640 510 604 510 560 c 0
- 510 516 474 480 430 480 c 0
-291 240 m 0xfd80
- 247 240 211 276 211 320 c 0
- 211 364 247 400 291 400 c 0
- 335 400 371 364 371 320 c 0
- 371 276 335 240 291 240 c 0xfd80
-568 240 m 0
- 524 240 488 276 488 320 c 0
- 488 364 524 400 568 400 c 0
- 612 400 648 364 648 320 c 0
- 648 276 612 240 568 240 c 0
-EndSplineSet
-EndChar
@@ -1,17 +0,0 @@
-StartChar: uniE009
-Encoding: 57353 57353 9
-Width: 880
-Flags: HMW
-LayerCount: 2
-Fore
-SplineSet
-716 10 m 1
- 378 244 l 1
- 165 244 l 1
- 165 559 l 1
- 379 559 l 1
- 716 793 l 1
- 716 10 l 1
-EndSplineSet
-Validated: 1
-EndChar
@@ -1,50 +0,0 @@
-StartChar: uniE00A
-Encoding: 57354 57354 10
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 252 48<406 406 456 456> 375 50<57 282 57 282 578 805> 500 48<406 406> 627 20G<149 149 713 713>
-VStem: 282 48<375 375 425 425> 406 50<26 252 26 252 548 774> 530 48<375 375>
-LayerCount: 2
-Fore
-SplineSet
-805 375 m 1
- 578 375 l 1
- 574 352 565 331 553 313 c 1
- 713 153 l 1
- 678 118 l 1
- 518 278 l 1
- 500 265 479 256 456 252 c 1
- 456 26 l 1
- 406 26 l 1
- 406 252 l 1
- 383 256 362 265 343 277 c 1
- 184 118 l 1
- 149 153 l 1
- 308 312 l 1
- 295 330 286 352 282 375 c 1
- 57 375 l 1
- 57 425 l 1
- 282 425 l 1
- 286 448 295 470 308 488 c 1
- 149 647 l 1
- 184 682 l 1
- 343 523 l 1
- 362 535 383 544 406 548 c 1
- 406 774 l 1
- 456 774 l 1
- 456 548 l 1
- 479 544 500 535 518 522 c 1
- 678 682 l 1
- 713 647 l 1
- 553 487 l 1
- 565 469 574 448 578 425 c 1
- 805 425 l 1
- 805 375 l 1
-430 300 m 0
- 485 300 530 345 530 400 c 0
- 530 455 485 500 430 500 c 0
- 375 500 330 455 330 400 c 0
- 330 345 375 300 430 300 c 0
-EndSplineSet
-EndChar
@@ -1,27 +0,0 @@
-StartChar: uniE00B
-Encoding: 57355 57355 11
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: -10 244<341 519 341 543> 566 54<413.5 446.5 413.5 519> 740 70<413.5 446.5>
-VStem: 20 88<354 446 354 513> 752 88<354 446>
-LayerCount: 2
-Fore
-SplineSet
-430 -10 m 0
- 204 -10 20 174 20 400 c 0
- 20 626 204 810 430 810 c 0
- 656 810 840 626 840 400 c 0
- 840 174 656 -10 430 -10 c 0
-430 620 m 0
- 463 620 490 647 490 680 c 0
- 490 713 463 740 430 740 c 0
- 397 740 370 713 370 680 c 0
- 370 647 397 620 430 620 c 0
-430 234 m 0
- 608 234 752 308 752 400 c 0
- 752 492 608 566 430 566 c 0
- 252 566 108 492 108 400 c 0
- 108 308 252 234 430 234 c 0
-EndSplineSet
-EndChar
@@ -1,21 +0,0 @@
-StartChar: uniE010
-Encoding: 57360 57360 12
-Width: 334
-GlyphClass: 2
-Flags: MW
-HStem: 0 90<221 258 221 258> 550 90<221 258 221 221>
-VStem: 76 145<90 550 90 640 90 640>
-LayerCount: 2
-Fore
-SplineSet
-258 640 m 1
- 258 550 l 1
- 221 550 l 1
- 221 90 l 1
- 258 90 l 1
- 258 0 l 1
- 76 0 l 1
- 76 640 l 1
- 258 640 l 1
-EndSplineSet
-EndChar
@@ -1,17 +0,0 @@
-StartChar: uniE011
-Encoding: 57361 57361 13
-Width: 334
-GlyphClass: 2
-Flags: MW
-HStem: 0 640<84 250 84 250>
-VStem: 84 166<0 640 0 640>
-LayerCount: 2
-Fore
-SplineSet
-250 640 m 1
- 250 0 l 1
- 84 0 l 1
- 84 640 l 1
- 250 640 l 1
-EndSplineSet
-EndChar
@@ -1,21 +0,0 @@
-StartChar: uniE012
-Encoding: 57362 57362 14
-Width: 334
-GlyphClass: 2
-Flags: MW
-HStem: 0 90<76 113 76 258 76 113> 550 90<76 113 76 258>
-VStem: 113 145<90 550 550 550>
-LayerCount: 2
-Fore
-SplineSet
-113 90 m 1
- 113 550 l 1
- 76 550 l 1
- 76 640 l 1
- 258 640 l 1
- 258 0 l 1
- 76 0 l 1
- 76 90 l 1
- 113 90 l 1
-EndSplineSet
-EndChar
@@ -1,17 +0,0 @@
-StartChar: uniE013
-Encoding: 57363 57363 15
-Width: 334
-GlyphClass: 2
-Flags: MW
-HStem: 255 130<102 232 102 232>
-VStem: 102 130<255 385 255 385>
-LayerCount: 2
-Fore
-SplineSet
-232 385 m 1
- 232 255 l 1
- 102 255 l 1
- 102 385 l 1
- 232 385 l 1
-EndSplineSet
-EndChar
@@ -1,16 +0,0 @@
-StartChar: uniE101
-Encoding: 57601 57601 16
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 780 20G<222 222>
-VStem: 222 600<400 400 400 800 400 800>
-LayerCount: 2
-Fore
-SplineSet
-822 400 m 1
- 222 0 l 1
- 222 800 l 1
- 822 400 l 1
-EndSplineSet
-EndChar
@@ -1,25 +0,0 @@
-StartChar: uniE104
-Encoding: 57604 57604 17
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 0 800<3 126 3 126 3 502 3 878> 780 20G<3 126 126 126 502 502 878 878>
-VStem: 3 123<0 800 0 800>
-LayerCount: 2
-Fore
-SplineSet
-126 800 m 1x60
- 126 0 l 1
- 3 0 l 1xa0
- 3 800 l 1
- 126 800 l 1x60
-502 800 m 1
- 502 0 l 1
- 127 400 l 1
- 502 800 l 1
-878 800 m 1
- 878 0 l 1
- 503 400 l 1
- 878 800 l 1
-EndSplineSet
-EndChar
@@ -1,25 +0,0 @@
-StartChar: uniE105
-Encoding: 57605 57605 18
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 0 800<3 3 3 379 3 755 755 878> 780 20G<3 3 379 379 755 878 878 878>
-VStem: 755 123<0 800>
-LayerCount: 2
-Fore
-SplineSet
-3 0 m 1x60
- 3 800 l 1
- 378 400 l 1
- 3 0 l 1x60
-379 0 m 1xa0
- 379 800 l 1
- 754 400 l 1
- 379 0 l 1xa0
-878 0 m 1
- 755 0 l 1
- 755 800 l 1
- 878 800 l 1
- 878 0 l 1
-EndSplineSet
-EndChar
@@ -1,22 +0,0 @@
-StartChar: uniE106
-Encoding: 57606 57606 19
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 0 649<68.5 556.5>
-VStem: 0 880
-LayerCount: 2
-Fore
-SplineSet
-880 380 m 0
- 880 230 685 101 449 101 c 0
- 390 101 336 107 283 118 c 1
- 278 49 189 0 85 0 c 0
- 52 0 24 14 0 40 c 1
- 82 48 137 93 137 158 c 0
- 137 163 137 168 135 172 c 0
- 58 217 19 273 19 380 c 0
- 19 528 258 649 449 649 c 0
- 664 649 880 508 880 380 c 0
-EndSplineSet
-EndChar
@@ -1,56 +0,0 @@
-StartChar: uniE107
-Encoding: 57607 57607 20
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 0 60<0 60 60 820> 106 50<146 343 146 343 146 390 390 641 680 735> 207 50<99 317 99 317 99 363 363 488 529 781> 580 60<60 820 60 820>
-VStem: 0 60<60 580> 99 218<207 257 207 257> 146 197<106 156 106 156> 363 125<207 257 207 257> 529 112<106 257 106 257> 680 55<106 156 106 156> 820 60<0 60 60 580>
-LayerCount: 2
-Fore
-SplineSet
-0 60 m 2xfde0
- 0 580 l 2
- 0 610 30 640 60 640 c 2
- 820 640 l 2
- 850 640 880 610 880 580 c 2
- 880 60 l 2
- 880 30 850 0 820 0 c 2
- 60 0 l 2
- 30 0 0 30 0 60 c 2xfde0
-60 60 m 1
- 820 60 l 1
- 820 580 l 1
- 60 580 l 1
- 60 60 l 1
-317 257 m 1
- 317 207 l 1
- 99 207 l 1
- 99 257 l 1
- 317 257 l 1
-488 257 m 1
- 488 207 l 1
- 363 207 l 1
- 363 257 l 1
- 488 257 l 1
-781 257 m 1
- 781 207 l 1
- 529 207 l 1
- 529 257 l 1
- 781 257 l 1
-343 156 m 1x4280
- 343 106 l 1
- 146 106 l 1
- 146 156 l 1
- 343 156 l 1x4280
-641 156 m 1
- 641 106 l 1
- 390 106 l 1
- 390 156 l 1x41c0
- 641 156 l 1
-735 156 m 1
- 735 106 l 1
- 680 106 l 1
- 680 156 l 1
- 735 156 l 1
-EndSplineSet
-EndChar
@@ -1,39 +0,0 @@
-StartChar: uniE108
-Encoding: 57608 57608 21
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 80 60<0 60 60 820> 321 159<274 606 274 606> 660 60<60 820 60 820>
-VStem: 0 60<140 660> 274 332<321 480 321 480> 820 60<80 140 140 660>
-LayerCount: 2
-Fore
-SplineSet
-0 140 m 2
- 0 660 l 2
- 0 690 30 720 60 720 c 2
- 820 720 l 2
- 850 720 880 690 880 660 c 2
- 880 140 l 2
- 880 110 850 80 820 80 c 2
- 60 80 l 2
- 30 80 0 110 0 140 c 2
-60 140 m 1
- 820 140 l 1
- 820 660 l 1
- 60 660 l 1
- 60 140 l 1
-580 600 m 1
- 760 600 l 1
- 760 420 l 1
- 580 600 l 1
-606 480 m 1
- 606 321 l 1
- 274 321 l 1
- 274 480 l 1
- 606 480 l 1
-300 200 m 1
- 120 200 l 1
- 120 380 l 1
- 300 200 l 1
-EndSplineSet
-EndChar
@@ -1,39 +0,0 @@
-StartChar: uniE109
-Encoding: 57609 57609 22
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 80 60<0 60 60 820> 296 209<285 595 285 595> 660 60<60 820 60 820>
-VStem: 0 60<140 660> 120 107<400 400 400 510> 285 310<296 505 296 505> 653 107<400 400> 820 60<80 140 140 660>
-LayerCount: 2
-Fore
-SplineSet
-0 140 m 2
- 0 660 l 2
- 0 690 30 720 60 720 c 2
- 820 720 l 2
- 850 720 880 690 880 660 c 2
- 880 140 l 2
- 880 110 850 80 820 80 c 2
- 60 80 l 2
- 30 80 0 110 0 140 c 2
-60 140 m 1
- 820 140 l 1
- 820 660 l 1
- 60 660 l 1
- 60 140 l 1
-227 400 m 1
- 120 290 l 1
- 120 510 l 1
- 227 400 l 1
-760 290 m 1
- 653 400 l 1
- 760 510 l 1
- 760 290 l 1
-595 505 m 1
- 595 296 l 1
- 285 296 l 1
- 285 505 l 1
- 595 505 l 1
-EndSplineSet
-EndChar
@@ -1,36 +0,0 @@
-StartChar: uniE10A
-Encoding: 57610 57610 23
-Width: 1977
-GlyphClass: 2
-Flags: HMWO
-HStem: 242 248<2 155 2 156>
-LayerCount: 2
-Fore
-SplineSet
-398 58 m 1
- 155 242 l 1
- 2 242 l 1
- 2 490 l 1
- 156 490 l 1
- 398 674 l 1
- 398 58 l 1
-809 524 m 0
- 814 524 819 523 823 519 c 0
- 831 511 831 499 823 491 c 2
- 697 365 l 1
- 823 239 l 2
- 830 232 830 221 823 213 c 0
- 816 206 804 206 797 213 c 2
- 671 339 l 1
- 545 213 l 2
- 538 206 525 206 518 213 c 0
- 510 221 510 233 518 241 c 2
- 643 367 l 1
- 517 493 l 2
- 510 500 510 511 517 519 c 0
- 525 526 536 526 544 519 c 2
- 670 393 l 1
- 796 519 l 2
- 799 523 804 524 809 524 c 0
-EndSplineSet
-EndChar
@@ -1,26 +0,0 @@
-StartChar: uniE10B
-Encoding: 57611 57611 24
-Width: 1977
-GlyphClass: 2
-Flags: MW
-HStem: 242 248<2 155 2 156>
-VStem: 603 47<326.5 405>
-LayerCount: 2
-Fore
-SplineSet
-650 366 m 0
- 650 281 615 198 545 119 c 1
- 507 142 l 1
- 571 213 603 287 603 366 c 0
- 603 444 571 518 507 590 c 1
- 545 613 l 1
- 615 534 650 452 650 366 c 0
-398 58 m 1
- 155 242 l 1
- 2 242 l 1
- 2 490 l 1
- 156 490 l 1
- 398 674 l 1
- 398 58 l 1
-EndSplineSet
-EndChar
@@ -1,33 +0,0 @@
-StartChar: uniE10C
-Encoding: 57612 57612 25
-Width: 1977
-GlyphClass: 2
-Flags: MW
-HStem: 242 248<2 155 2 156>
-VStem: 603 47<326.5 405> 717 47<316.5 416>
-LayerCount: 2
-Fore
-SplineSet
-764 366 m 0
- 764 258 720 156 631 61 c 1
- 593 84 l 1
- 675 173 717 267 717 366 c 0
- 717 466 675 559 593 647 c 1
- 631 671 l 1
- 720 578 764 476 764 366 c 0
-650 366 m 0
- 650 281 615 198 545 119 c 1
- 507 142 l 1
- 571 213 603 287 603 366 c 0
- 603 444 571 518 507 590 c 1
- 545 613 l 1
- 615 534 650 452 650 366 c 0
-398 58 m 1
- 155 242 l 1
- 2 242 l 1
- 2 490 l 1
- 156 490 l 1
- 398 674 l 1
- 398 58 l 1
-EndSplineSet
-EndChar
@@ -1,40 +0,0 @@
-StartChar: uniE10D
-Encoding: 57613 57613 26
-Width: 1977
-GlyphClass: 2
-Flags: MW
-HStem: 242 248<2 155 2 156> 709 20G<717 717>
-VStem: 603 47<326.5 405> 717 47<316.5 416> 830 47<304 426.5>
-LayerCount: 2
-Fore
-SplineSet
-877 366 m 0
- 877 236 824 115 717 3 c 1
- 679 27 l 1
- 780 130 830 242 830 366 c 0
- 830 487 780 600 679 705 c 1
- 717 729 l 1
- 824 617 877 496 877 366 c 0
-764 366 m 0
- 764 258 720 156 631 61 c 1
- 593 84 l 1
- 675 173 717 267 717 366 c 0
- 717 466 675 559 593 647 c 1
- 631 671 l 1
- 720 578 764 476 764 366 c 0
-650 366 m 0
- 650 281 615 198 545 119 c 1
- 507 142 l 1
- 571 213 603 287 603 366 c 0
- 603 444 571 518 507 590 c 1
- 545 613 l 1
- 615 534 650 452 650 366 c 0
-398 58 m 1
- 155 242 l 1
- 2 242 l 1
- 2 490 l 1
- 156 490 l 1
- 398 674 l 1
- 398 58 l 1
-EndSplineSet
-EndChar
@@ -1,53 +0,0 @@
-StartChar: uniE10E
-Encoding: 57614 57614 27
-Width: 1977
-GlyphClass: 2
-Flags: MW
-HStem: 49 95<806 818.5> 242 248<2 155 2 156>
-VStem: 559 47<326.5 405> 673 47<316.5 416> 767 91<90 103.5 648 652>
-LayerCount: 2
-Fore
-SplineSet
-720 366 m 0
- 720 258 676 156 587 61 c 1
- 549 84 l 1
- 631 173 673 267 673 366 c 0
- 673 466 631 559 549 647 c 1
- 587 671 l 1
- 676 578 720 476 720 366 c 0
-606 366 m 0
- 606 281 571 198 501 119 c 1
- 463 142 l 1
- 527 213 559 287 559 366 c 0
- 559 444 527 518 463 590 c 1
- 501 613 l 1
- 571 534 606 452 606 366 c 0
-398 58 m 1
- 155 242 l 1
- 2 242 l 1
- 2 490 l 1
- 156 490 l 1
- 398 674 l 1
- 398 58 l 1
-858 648 m 1
- 824 238 l 2
- 823 224 819 217 812 217 c 0
- 805 217 801 224 800 238 c 2
- 767 648 l 1
- 767 652 l 2
- 767 665 771 675 780 682 c 0
- 789 690 800 694 812 694 c 0
- 825 694 835 690 844 682 c 0
- 853 675 858 665 858 652 c 2
- 858 648 l 1
-858 97 m 0
- 858 83 853 72 845 63 c 0
- 836 53 825 49 812 49 c 0
- 800 49 789 53 780 63 c 0
- 771 72 767 83 767 97 c 0
- 767 110 771 121 780 130 c 0
- 789 140 800 144 812 144 c 0
- 825 144 836 140 845 130 c 0
- 853 121 858 110 858 97 c 0
-EndSplineSet
-EndChar
@@ -1,16 +0,0 @@
-StartChar: uniE110
-Encoding: 57616 57616 28
-Width: 880
-GlyphClass: 2
-Flags: MW
-HStem: 780 20G<656 656>
-VStem: 56 600<400 400>
-LayerCount: 2
-Fore
-SplineSet
-656 0 m 1
- 56 400 l 1
- 656 800 l 1
- 656 0 l 1
-EndSplineSet
-EndChar
@@ -1,37 +0,0 @@
-StartChar: uniE111
-Encoding: 57617 57617 29
-Width: 880
-GlyphClass: 2
-Flags: W
-LayerCount: 2
-Fore
-SplineSet
-0 140 m 2
- 0 660 l 2
- 0 690 30 720 60 720 c 2
- 820 720 l 2
- 850 720 880 690 880 660 c 2
- 880 140 l 2
- 880 110 850 80 820 80 c 2
- 60 80 l 2
- 30 80 0 110 0 140 c 2
-60 140 m 1
- 820 140 l 1
- 820 660 l 1
- 60 660 l 1
- 60 140 l 1
-227 400 m 1
- 120 290 l 1
- 120 510 l 1
- 227 400 l 1
-760 290 m 1
- 653 400 l 1
- 760 510 l 1
- 760 290 l 1
-595 505 m 1
- 595 296 l 1
- 285 296 l 1
- 285 505 l 1
- 595 505 l 1
-EndSplineSet
-EndChar
@@ -17,133 +17,157 @@
 # When multiple files were specified, their info will be put into FOO_* for the
 # first file, FOO_1_* for the second file, FOO_2_* for the third file, etc.

-__midentify__main() {
-
-    case "$0" in
-        mpv_identify.sh|*/mpv_identify.sh)
-            # we are NOT being sourced
-            [ -n "$1" ] && set -- '' "$@"
-            ;;
-    esac
-
-    if [ "$#" -lt 2 ]; then
-        cat >&2 <<EOF
-Usage 1 (for humans only): $0 filename.mkv
-will print all property values.
-Note that this output really shouldn't be parsed, as the
-format is subject to change.
-
-Usage 2 (for use by scripts): see top of this file
-
-NOTE: for mkv with ordered chapters, this may
-not always identify the specified file, but the
-file providing the first chapter. Specify
--no-ordered-chapters to prevent this.
-EOF
-        return 2
-    fi
-
-    local LF="
-"
-
-    local nextprefix="$1"
-    shift
-
-    if [ -n "$nextprefix" ]; then
-        # in case of error, we always want this unset
-        unset "${nextprefix}path"
-    fi
-
-    local allprops="
-        filename
-        path
-        stream-start
-        stream-end
-        stream-length
-
-        demuxer
-
-        length
-        chapters
-        editions
-        titles
-        duration
-
-        audio
-        audio-bitrate
-        audio-codec
-        audio-codec-name
-
-        video
-        angle
-        video-bitrate
-        video-codec
-        video-format
-        video-aspect
-        container-fps
-        width
-        height
-        dwidth
-        dheight
-
-        sub
-    "
-    # TODO add metadata support once mpv can do it
-
-    local propstr="X-MIDENTIFY-START:$LF"
-    local key
-    for key in $allprops; do
-        propstr="${propstr}X-MIDENTIFY: $key \${=$key}$LF"
-        key="$(printf '%s\n' "$key" | tr - _)"
-        unset "$nextprefix$key"
-    done
-
-    local fileindex=0
-    local prefix=
-    local line
-    while IFS= read -r line; do
-        case "$line" in
-            X-MIDENTIFY-START:)
-                if [ -n "$nextprefix" ]; then
-                    prefix="$nextprefix"
-                    if [ "$fileindex" -gt 0 ]; then
-                        nextprefix="${prefix%${fileindex}_}"
-                    fi
-                    fileindex="$((fileindex+1))"
-                    nextprefix="${nextprefix}${fileindex}_"
-                    for key in $allprops; do
-                        key="$(printf '%s\n' "$key" | tr - _)"
-                        unset "$nextprefix$key"
-                    done
-                else
-                    if [ "$fileindex" -gt 0 ]; then
-                        printf '\n'
-                    fi
-                    fileindex="$((fileindex+1))"
-                fi
+case "$0" in
+    mpv_identify.sh|*/mpv_identify.sh)
+        # we are NOT being sourced
+        case "$1" in
+            '')
                ;;
-            X-MIDENTIFY:\ *)
-                local key="${line#X-MIDENTIFY: }"
-                local value="${key#* }"
-                key="${key%% *}"
-                key="$(printf '%s\n' "$key" | tr - _)"
-                if [ -n "$nextprefix" ]; then
-                    if [ -z "$prefix" ]; then
-                        echo >&2 "Got X-MIDENTIFY: without X-MIDENTIFY-START:"
-                    elif [ -n "$value" ]; then
-                        eval "$prefix$key"='"$value"'
-                    fi
-                else
-                    if [ -n "$value" ]; then
-                        printf '%s=%s\n' "$key" "$value"
-                    fi
-                fi
+            *)
+                set -- '' "$@"
                ;;
        esac
-    done <<EOF
-$(${MPV:-mpv} --term-playing-msg="$propstr" --vo=null --ao=null \
-              --frames=1 --quiet --no-cache --no-config -- "$@")
-EOF
-}
+        ;;
+esac

-__midentify__main "$@"
+if [ $# -lt 2 ]; then
+    echo >&2 "Usage 1 (for humans only): $0 filename.mkv"
+    echo >&2 "will print all property values."
+    echo >&2 "Note that this output really shouldn't be parsed, as the"
+    echo >&2 "format is subject to change."
+    echo >&2
+    echo >&2 "Usage 2 (for use by scripts): see top of this file"
+    echo >&2
+    echo >&2 "NOTE: for mkv with ordered chapters, this may"
+    echo >&2 "not always identify the specified file, but the"
+    echo >&2 "file providing the first chapter. Specify"
+    echo >&2 "--no-ordered-chapters to prevent this."
+    exit 1
+fi
+
+if [ -z "$MPV" ]; then
+    MPV="mpv"
+fi
+
+__midentify__LF="
+"
+
+__midentify__nextprefix=$1
+shift
+
+if [ -n "$__midentify__nextprefix" ]; then
+    # in case of error, we always want this unset
+    eval unset $__midentify__nextprefix'path'
+fi
+
+__midentify__allprops="
+    filename
+    path
+    stream-start
+    stream-end
+    stream-length
+
+    demuxer
+
+    length
+    chapters
+    editions
+    titles
+
+    audio
+    audio-bitrate
+    audio-codec
+    audio-format
+    channels
+    samplerate
+
+    video
+    angle
+    video-bitrate
+    video-codec
+    video-format
+    video-aspect
+    fps
+    width
+    height
+    dwidth
+    dheight
+
+    sub
+"
+# TODO add metadata support once mpv can do it
+
+__midentify__propstr="X-MIDENTIFY-START:$__midentify__LF"
+for __midentify__key in $__midentify__allprops; do
+    __midentify__propstr=$__midentify__propstr"X-MIDENTIFY: $__midentify__key \${=$__midentify__key}$__midentify__LF"
+    __midentify__key=`echo "$__midentify__key" | tr - _`
+    eval unset $__midentify__nextprefix$__midentify__key
+done
+
+__midentify__output=`$MPV --term-playing-msg="$__midentify__propstr" --vo=null --ao=null --frames=1 --quiet --no-cache --no-config "$@"`
+__midentify__fileindex=0
+__midentify__prefix=
+while :; do
+    case "$__midentify__output" in
+        '')
+            break
+            ;;
+        *$__midentify__LF*)
+            __midentify__line=${__midentify__output%%$__midentify__LF*}
+            __midentify__output=${__midentify__output#*$__midentify__LF}
+            ;;
+        *)
+            __midentify__line=$__midentify__output
+            __midentify__output=
+            ;;
+    esac
+    case "$__midentify__line" in
+        X-MIDENTIFY-START:)
+            if [ -n "$__midentify__nextprefix" ]; then
+                __midentify__prefix=$__midentify__nextprefix
+                if [ $__midentify__fileindex -gt 0 ]; then
+                    __midentify__nextprefix=${__midentify__prefix%$__midentify__fileindex\_}
+                fi
+                __midentify__fileindex=$(($__midentify__fileindex+1))
+                __midentify__nextprefix=$__midentify__nextprefix$__midentify__fileindex\_
+                for __midentify__key in $__midentify__allprops; do
+                    __midentify__key=`echo "$__midentify__key" | tr - _`
+                    eval unset $__midentify__nextprefix$__midentify__key
+                done
+            else
+                if [ $__midentify__fileindex -gt 0 ]; then
+                    echo
+                fi
+                __midentify__fileindex=$(($__midentify__fileindex+1))
+            fi
+            ;;
+        X-MIDENTIFY:\ *)
+            __midentify__key=${__midentify__line#X-MIDENTIFY:\ }
+            __midentify__value=${__midentify__key#* }
+            __midentify__key=${__midentify__key%% *}
+            __midentify__key=`echo "$__midentify__key" | tr - _`
+            if [ -n "$__midentify__nextprefix" ]; then
+                if [ -z "$__midentify__prefix" ]; then
+                    echo >&2 "Got X-MIDENTIFY: without X-MIDENTIFY-START:"
+                elif [ -n "$__midentify__value" ]; then
+                    eval $__midentify__prefix$__midentify__key=\$__midentify__value
+                fi
+            else
+                if [ -n "$__midentify__value" ]; then
+                    echo "$__midentify__key=$__midentify__value"
+                fi
+            fi
+            ;;
+    esac
+done
+
+unset __midentify__fileindex
+unset __midentify__allprops
+unset __midentify__key
+unset __midentify__LF
+unset __midentify__line
+unset __midentify__output
+unset __midentify__nextprefix
+unset __midentify__prefix
+unset __midentify__propstr
+unset __midentify__value
@@ -3,7 +3,6 @@
 import os
 import shutil
 import sys
-import fileinput
 from optparse import OptionParser

 def sh(command):
@@ -36,24 +35,10 @@ def copy_binary(binary_name):
    shutil.copy(binary_name, target_binary(binary_name))

 def apply_plist_template(plist_file, version):
-    for line in fileinput.input(plist_file, inplace=1):
-        print (line.rstrip().replace('${VERSION}', version))
-
-def create_bundle_symlink(binary_name, symlink_name):
-    os.symlink(os.path.basename(binary_name),
-               os.path.join(target_directory(binary_name), symlink_name))
-
-def bundle_version():
-    if os.path.exists('VERSION'):
-        x = open('VERSION')
-        version = x.read()
-        x.close()
-    else:
-        version = sh("./version.sh").strip()
-    return version
+    sh("sed -i -e 's/${VERSION}/%s/g' %s" % (version, plist_file))

 def main():
-    version = bundle_version().rstrip()
+    version = sh("./version.sh --print").strip()

    usage = "usage: %prog [options] arg"
    parser = OptionParser(usage)
@@ -73,8 +58,6 @@ def main():
    copy_bundle(binary_name)
    print("> copying binary")
    copy_binary(binary_name)
-    print("> create bundle symlink")
-    create_bundle_symlink(binary_name, "mpv-bundle")
    print("> generating Info.plist")
    apply_plist_template(target_plist(binary_name), version)

@@ -88,7 +88,6 @@
          <string>VOB</string>
          <string>WEBM</string>
          <string>WMV</string>
-          <string>MK3D</string>
          <string>asf</string>
          <string>avi</string>
          <string>cpk</string>
@@ -123,7 +122,6 @@
          <string>vob</string>
          <string>webm</string>
          <string>wmv</string>
-          <string>mk3d</string>
        </array>
        <key>CFBundleTypeIconFile</key>
        <string>document.icns</string>
@@ -173,7 +171,7 @@
      </dict>
    </array>
    <key>CFBundleExecutable</key>
-    <string>mpv-bundle</string>
+    <string>mpv</string>
    <key>CFBundleIconFile</key>
    <string>icon</string>
    <key>CFBundleIdentifier</key>
@@ -210,7 +208,6 @@
          <string>mms</string>
          <string>mmst</string>
          <string>http</string>
-          <string>https</string>
          <string>httpproxy</string>
          <string>rtp</string>
          <string>rtsp</string>
@@ -516,47 +513,6 @@
          <key>public.filename-extension</key>
          <array>
            <string>mkv</string>
-          </array>
-        </dict>
-      </dict>
-      <dict>
-        <key>UTTypeConformsTo</key>
-        <array>
-          <string>public.movie</string>
-        </array>
-        <key>UTTypeDescription</key>
-        <string>Matroska stereoscopic/3D video</string>
-        <key>UTTypeIconFile</key>
-        <string>document.icns</string>
-        <key>UTTypeIdentifier</key>
-        <string>io.mpv.mk3d</string>
-        <key>UTTypeReferenceURL</key>
-        <string>http://www.matroska.org</string>
-        <key>UTTypeTagSpecification</key>
-        <dict>
-          <key>public.filename-extension</key>
-          <array>
-            <string>mk3d</string>
-          </array>
-        </dict>
-      </dict>
-      <dict>
-        <key>UTTypeConformsTo</key>
-        <array>
-          <string>public.movie</string>
-        </array>
-        <key>UTTypeDescription</key>
-        <string>WebM Video</string>
-        <key>UTTypeIconFile</key>
-        <string>document.icns</string>
-        <key>UTTypeIdentifier</key>
-        <string>io.mpv.webm</string>
-        <key>UTTypeReferenceURL</key>
-        <string>http://www.webmproject.org</string>
-        <key>UTTypeTagSpecification</key>
-        <dict>
-          <key>public.filename-extension</key>
-          <array>
            <string>webm</string>
          </array>
        </dict>
@@ -668,90 +624,6 @@
          </array>
        </dict>
      </dict>
-      <dict>
-        <key>UTTypeConformsTo</key>
-        <array>
-          <string>public.movie</string>
-        </array>
-        <key>UTTypeDescription</key>
-        <string>AVC raw stream</string>
-        <key>UTTypeIconFile</key>
-        <string>document.icns</string>
-        <key>UTTypeIdentifier</key>
-        <string>io.mpv.h264</string>
-        <key>UTTypeReferenceURL</key>
-        <string>http://www.itu.int/rec/T-REC-H.264</string>
-        <key>UTTypeTagSpecification</key>
-        <dict>
-          <key>public.filename-extension</key>
-          <array>
-            <string>264</string>
-          </array>
-        </dict>
-      </dict>
-      <dict>
-        <key>UTTypeConformsTo</key>
-        <array>
-          <string>public.movie</string>
-        </array>
-        <key>UTTypeDescription</key>
-        <string>HEVC raw stream</string>
-        <key>UTTypeIconFile</key>
-        <string>document.icns</string>
-        <key>UTTypeIdentifier</key>
-        <string>io.mpv.hevc</string>
-        <key>UTTypeReferenceURL</key>
-        <string>http://hevc.info</string>
-        <key>UTTypeTagSpecification</key>
-        <dict>
-          <key>public.filename-extension</key>
-          <array>
-            <string>hevc</string>
-          </array>
-        </dict>
-      </dict>
-      <dict>
-        <key>UTTypeConformsTo</key>
-        <array>
-          <string>public.movie</string>
-        </array>
-        <key>UTTypeDescription</key>
-        <string>YUV stream</string>
-        <key>UTTypeIconFile</key>
-        <string>document.icns</string>
-        <key>UTTypeIdentifier</key>
-        <string>io.mpv.yuv</string>
-        <key>UTTypeReferenceURL</key>
-        <string>http://en.wikipedia.org/wiki/YUV</string>
-        <key>UTTypeTagSpecification</key>
-        <dict>
-          <key>public.filename-extension</key>
-          <array>
-            <string>yuv</string>
-          </array>
-        </dict>
-      </dict>
-      <dict>
-        <key>UTTypeConformsTo</key>
-        <array>
-          <string>public.movie</string>
-        </array>
-        <key>UTTypeDescription</key>
-        <string>YUV4MPEG2 stream</string>
-        <key>UTTypeIconFile</key>
-        <string>document.icns</string>
-        <key>UTTypeIdentifier</key>
-        <string>io.mpv.y4m</string>
-        <key>UTTypeReferenceURL</key>
-        <string>http://wiki.multimedia.cx/index.php?title=YUV4MPEG2</string>
-        <key>UTTypeTagSpecification</key>
-        <dict>
-          <key>public.filename-extension</key>
-          <array>
-            <string>y4m</string>
-          </array>
-        </dict>
-      </dict>
      <dict>
        <key>UTTypeConformsTo</key>
        <array>
Author	SHA1	Message	Date
Alessandro Ghedini	777295ce28	Release 0.4.2	2014-07-26 12:12:40 +02:00
Alessandro Ghedini	d50be0a2a6	command: append entries to the end of the playlist with loadlist append Currently entries are added after the current playlist element. This is kinda confusing, more so given that "loadfile append" appends at the end of the playlist.	2014-07-26 11:55:02 +02:00
wm4	2d8e26bb72	command: add append-play loadfile mode "loadfile filename append-play" will now always append the file to the playlist, and if nothing is playing yet, start playback. I don't want to change the semantics of "append" mode, so a new mode is needed. Probably fixes issue #950.	2014-07-24 21:15:55 +02:00
wm4	7ee275095f	manpage: correct the --mf options The MPlayer style syntax ("-mf fps=10:type=png") was removed a while ago, and now only the flat variants ("--mf-fps=10" etc.) work. CC: @mpv-player/stable	2014-07-23 12:39:38 +02:00
wm4	5a5b219853	demux: fix opening pipes with demux_lavf We told the demuxer that a pipe (if stream cache is enabled) is seekable. This is because the stream cache is technically seekable, it's just that seeking may fail at runtime if a non-cached byte range is requested. This caused libavformat to issue seeks on initialization (at least when piping mp4 youtube videos). Initialization failed completely after spamming tons of error messages. So, if an unseekable stream is cached, tell the demuxer that the file is not seekable. This gets reversed later (when printing a message about caching an unseekable stream), so the user can still try his luck by issuing a seek command. The important part is that libavformat initialization will not take code paths that will unnecessarily seek for whatever reasons. CC: @mpv-player/stable: regression from 0.3.x Conflicts: demux/demux.c	2014-07-20 21:56:46 +02:00
wm4	608bed1aed	demux_lavf: reverse rotation direction with new API The old FFmpeg API and the new Libav API disagree about mp4 display rotation direction. Well, whatever, fix it trial-and-error-style. CC: @mpv-player/stable: add	2014-07-18 10:31:58 +02:00
wm4	636b62fc1a	audio: drop buffered audio when switching tracks or filters No reason to wait until the audio has been played. This isn't a problem with gapless audio disabled, and since gapless is now default, this behavior might be perceived as regression. CC: @mpv-player/stable	2014-07-14 13:48:36 +02:00
wm4	78195cd742	audio: don't wait for draining if paused Logic for this was missing from pull.c. For push.c it was missing if the driver didn't support it. But even if the driver supported it (such as with ao_alsa), strange behavior was observed by users. See issue #933. Always check explicitly whether the AO is in paused mode, and if so, don't drain. Possibly fixes #933. CC: @mpv-player/stable	2014-07-14 13:48:31 +02:00
Alessandro Ghedini	e7fc048eca	stream_dvdnav: suspend read on vts change even if the requested title is not found	2014-07-14 13:48:24 +02:00
wm4	0ab7d01425	stream: don't sleep for reconnecting network if playback is stopped Also silences the bogus message if that happens. CC: @mpv-player/stable	2014-07-13 15:06:52 +02:00
wm4	bd0b661183	cache_file: fix operation if stream size is unknown Happens when playing from a pipe. Note that seeking forward doesn't work. It would be possible to create a workaround for that by reading and skipping data until the target position is reached (and writing the skipped data into the cache file), but I'm not sure about that. Fixes #928. CC: @mpv-player/stable	2014-07-13 15:06:46 +02:00
Alessandro Ghedini	0989d8358c	RELEASE_NOTES: include changes in point releases too	2014-07-13 15:05:57 +02:00
Alessandro Ghedini	c979ee34e1	RELEASE_NOTES: add some more changes that I missed	2014-07-13 15:05:46 +02:00
Alessandro Ghedini	bb00774514	RELEASE_NOTES: use the release version as title	2014-07-12 13:20:43 +02:00
Alessandro Ghedini	ef41a98a79	Release 0.4.0	2014-07-11 17:22:35 +02:00
wm4	b18c2d9fe2	input: restore ability to combine mouse buttons Key bindings are decided on the "down" event, so if the prefix is not unique, the first/shortest will be used (e.g. when both "a" and "a-b" are mapped, "a" will always be chosen). This also breaks combining multiple mouse buttons. But it seems users expect it to work, and it's indeed a bit strange that it shouldn't work, as mouse bindings are emitted on the key "up" event, not "down" (if the shorter binding didn't emit a command yet, why shouldn't it be combinable). Deal with this by clearing the key history when a command is actually emitted, instead of when a command is decided. This means if both MOUSE_BTN0 and MOUSE_BTN0-MOUSE_BTN1 are mapped, the sequence of holding down BTN0 and then BTN1 will redecide the current command. On the other hand, if BTN0 is released before BTN1 is pressed, the command is emitted, and the key history is deleted. So the BTN1 press will not trigger BTN0-BTN1. For normal keys, nothing should change, because commands are emitted on the "down" event already, so the key history is always cleared. Might fix #902. CC: @mpv-player/stable (if this fix is successful)	2014-07-08 10:11:07 +02:00
wm4	8f5ebdbe59	ao_null: disable latency emulation Doesn't work quite right, and will pause for the latency duration after seeking. Some users use --ao=null to disable audio (even though they should probably use --no-audio), and this use-case is broken by this issue too. CC: @mpv-player/stable	2014-07-08 10:10:59 +02:00
wm4	e8616fea50	vf_vapoursynth: reset error state on seeking When seeking, we violently destroy the filter, because vapoursynth has no proper API for terminating a video with unknown frame count. This looks like an error to vapoursynth, and the error is returned via the frame callbacks. The bug is that we remember this error state across reinitialization, so on the first filter call after reinitialization, we thought filtering the current frame failed. This caused a shift by 1 frame on each seek. CC: @mpv-player/stable	2014-07-05 19:04:05 +02:00
wm4	00997484f1	build: allow compilation without any atomics Not all compilers on all platforms have atomics available (even if they could, technically speaking). We don't use atomics that much, only the following things rely on it: 1. the audio pull code, and all audio outputs using it 2. updating global msg levels 3. reading log messages through the client API Just disable 1. and 3. if atomics are not available. For 2., using fake- atomics isn't too bad; at worst, message levels won't properly update under certain situations (but most likely, it will work just fine). This means if atomics are not available, the client API function mpv_request_log_messages() will do nothing. CC: @mpv-player/stable	2014-07-05 19:04:00 +02:00
wm4	ea556e5398	options: remove bogus replacement message for --fstype CC: @mpv-player/stable	2014-07-05 19:03:49 +02:00
wm4	a3fc0b2015	options: add --autosub-match to option replacement list CC: @mpv-player/stable	2014-07-05 19:03:39 +02:00
wm4	2db094203d	dvd: flush buffers properly on seek Suggested by tholin on github issue #882. This is not entirely clean, but the fields we're accessing might be considered internal to libavformat. On the other hand, existence of the fields is guaranteed by the ABI, and nothing in the libavformat doxygen suggestes they're not allowed to be accessed. CC: @mpv-player/stable	2014-07-05 19:03:32 +02:00
wm4	958858f920	demux_lavf: for now, ignore the new libavformat image demuxers Recently, libavformat added demuxers to open image files like normal demuxers. This is a good thing, but for now they interfere with the operation of demux_mf. Add them to the blacklist until there is a proper solution. (The list doesn't contain _all_ recognized image formats, just those that might interfere with demux_mf.) CC: @mpv-player/stable	2014-07-05 19:03:28 +02:00
tholin	bd271ae1cc	stream_dvdnav: check the length of all titles with dvdnav://longest The last title was ignored before. CC: @mpv-player/stable Signed-off-by: wm4 <wm4@nowhere>	2014-07-05 00:29:17 +02:00
tholin	c71644b595	stream_dvdnav: free pointer to priv->filename on close CC: @mpv-player/stable Signed-off-by: wm4 <wm4@nowhere>	2014-07-05 00:29:06 +02:00
tholin	9b18ed8d8b	stream_dvdnav: make sure seeking bounds are within range libdvdnav returns an error is the seek position is out of range. CC: @mpv-player/stable Signed-off-by: wm4 <wm4@nowhere>	2014-07-05 00:29:01 +02:00
wm4	5dce714dfe	client API: allow calling mpv_terminate_destroy(NULL) This is an oversight and a bug. CC: @mpv-player/stable	2014-07-05 00:28:54 +02:00
Alessandro Ghedini	25a0709972	TOOLS/zsh.pl: sort options in reverse order by length This stops options that are prefixes of other options from blocking completion of values for the longer ones. Conflicts: TOOLS/zsh.pl	2014-07-05 00:28:05 +02:00
Philip Sequeira	6cf2f634b3	TOOLS/zsh.pl: don't consume extra arguments Completion now uses "--opt=value" instead of "--opt value". Once the user presses space and starts a new argument, the option just completed is out of the picture, whether or not it was given an argument. This handles options with no arguments or optional arguments much better; previously, completing such an option would effectively disable completion for the next argument. Custom completed options such as "--ao" and friends will no longer claim to consume an extra argument.	2014-07-05 00:26:55 +02:00
Philip Sequeira	e165ccbf3b	TOOLS/zsh.pl: escape all colons in option descriptions	2014-07-05 00:26:00 +02:00
wm4	f78c0692e2	cache: clear DVD timestamps When resizing the cache, the buffer for the DVD timestamps is initialized with 0. This causes the player to always return playback position 0 with any file format (not just DVD), and also makes all relative seeks relative to position 0. Fix this by clearing the timestamps explicitly. Closes #899. CC: @mpv-player/stable	2014-07-05 00:25:49 +02:00
wm4	59f456cdd3	x11: clear window only on initial map Apparently clearing on every map can cause problems with vdpau when switching virtual desktops and such. This was observed with at least XMonad and nvidia-340.17. It's not observed on some other setups without XMonad. It's not clear why this happens. Normally, the window background is not saved, so clearing should have no additional affect. It's a complete mystery. Possible, the use of legacy X drawing commands (used to clear the window) interferes with vdpau operation in non-trivial ways. Work this around by clearing on initial map only. This probably only hides the underlying issue, but good enough. Closes #897. CC: @mpv-player/stable	2014-07-05 00:25:42 +02:00
wm4	0e35c230f4	demux_mkv: minor improvement to overflow check CC: @mpv-player/stable	2014-07-05 00:25:38 +02:00
Alessandro Ghedini	9ae80929ea	README: fix link to release policy document	2014-07-05 00:25:30 +02:00
wm4	98d1358e6e	options: fix --gapless-audio default value It was intended to be set to "weak" (and that was even documented), but the actual setting was "no". Closes #890. CC: @mpv-player/stable	2014-07-05 00:25:26 +02:00
wm4	e71d68cdae	demux_mkv: add some overflow checks etc. Some of these might be security relevant. The RealAudio code was especially bad. I'm not sure if all RealAudio stuff still plays correctly; I didn't have that many samples for testing. Some checks might be unnecessary or overcomplicated compared to the (obfuscated) nature of the code. CC: @mpv-player/stable	2014-07-05 00:25:19 +02:00
Mohammad Alsaleh	950ef5b75b	af_volume: fix calculations including replay-gain rgain is not an additive value. It's a multiplier/gain. Previous behaviour produced negative level values in some cases (when rgain < 1.0) which caused volume to be louder when its value was lowered. CC: @mpv-player/stable Signed-off-by: Mohammad Alsaleh <CE.Mohammad.AlSaleh@gmail.com> Signed-off-by: wm4 <wm4@nowhere>	2014-07-05 00:25:04 +02:00
wm4	0075f8e0cf	sub: fix undefined behavior with dvd:// The string could get reallocated. CC: @mpv-player/stable	2014-07-05 00:24:59 +02:00
Alessandro Ghedini	49275b2879	Release 0.4.0	2014-06-25 20:50:02 +02:00