Release 0.29.1

cocoa-cb: fix side by side Split View
when entering a Split View a windowDidEnterFullScreen event happens without a previous toggleFullScreen call. in that case it tries to stop an animation that was never initiated by us and basically breaks the system initiated fullscreen, or in this case the Split View. immediately after entering the fullscreen it tries top stop the animation and resizes the window, which causes the window to exit fullscreen. only try to stop an animation that was initiated by us and is safe to stop. (cherry picked from commit 2b0b9bb6a1)
2018-10-02 22:03:41 +03:00 · 2018-10-02 20:36:55 +03:00 · 2018-10-02 00:42:58 +03:00 · 2018-10-02 00:42:51 +03:00 · 2018-10-01 20:29:51 +03:00 · 2018-10-01 18:55:06 +03:00
748 changed files with 59053 additions and 92700 deletions
@@ -1,15 +0,0 @@
-# To use this config on you editor, follow the instructions at:
-# http://editorconfig.org
-
-root = true
-
-[*]
-charset = utf-8
-insert_final_newline = true
-indent_style = space
-indent_size = 4
-max_line_length = 80
-trim_trailing_whitespace = true
-
-[.git/COMMIT*]
-max_line_length = 72
@@ -0,0 +1,26 @@
+### 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
+https://0x0.st/ 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,16 +0,0 @@
---
-name: 'README: DO NOT IGNORE OR DELETE THE ISSUE TEMPLATE'
-about: 'Chose and fill out one of the following templates!'
-title: ''
-labels: priority:ignored-issue-template
-assignees: ''
-
---
-
-We ask you to not ignore the issue template. Fill it out as good and correct as
-possible. Issues that don't adhere to our request will be closed for ignoring
-the issue template. This is because analyzing a bug without a log file is harder
-than necessary. Low quality bug reports are noise.
-
-Please go back and chose the proper issue template. Opening issues with this
-template will be closed immediately.
@@ -1,49 +0,0 @@
---
-name: 'Report a Linux Issue'
-about: 'Create a report for a runtime related Linux Issue'
-title: ''
-labels: 'os:linux'
-assignees: ''
-
---
-
-### Important Information
-
-Provide following Information:
- mpv version
- Linux Distribution and Version
- Source of the mpv binary
- If known which version of mpv introduced the problem
- Window Manager and version
- GPU driver and version
- Possible screenshot or video of visual glitches
-
-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
-
-Try to reproduce your issue with --no-config first. If it isn't reproducible
-with --no-config try to first find out which option or script causes your issue.
-
-Describe the reproduction steps as precise as possible. It's very likely that
-the bug you experience wasn't reproduced by the developer because the workflow
-differs from your own.
-
-### Expected behavior
-
-### Actual behavior
-
-### Log file
-
-Make a log file made with -v -v or --log-file=output.txt, paste it to
-https://0x0.st/ or attach it to the github issue, and replace this text with a
-link to it.
-
-The issue will be closed for ignoring the issue template.
-
-### 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,51 +0,0 @@
---
-name: 'Report a macOS Issue'
-about: 'Create a report for a runtime related macOS Issue'
-title: ''
-labels: 'os:mac'
-assignees: ''
-
---
-
-### Important Information
-
-Provide following Information:
- mpv version
- macOS Version
- Source of the mpv binary or bundle
- If known which version of mpv introduced the problem
- Possible screenshot or video of visual glitches
-
-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
-
-Try to reproduce your issue with --no-config first. If it isn't reproducible
-with --no-config try to first find out which option or script causes your issue.
-
-Describe the reproduction steps as precise as possible. It's very likely that
-the bug you experience wasn't reproduced by the developer because the workflow
-differs from your own.
-
-### Expected behavior
-
-### Actual behavior
-
-### Log file
-
-Make a log file made with -v -v or --log-file=output.txt. If you use the Bundle
-from a version later than 0.32 a default log is created for your last run at
-~/Library/Logs/mpv.log. You can jump to that file via the Help > Show log File…
-menu. Paste the log to https://0x0.st/ or attach it to the github issue, and
-replace this text with a link to it.
-
-In the case of a crash please provide the macOS Crash Report (Backtrace).
-
-The issue will be closed for ignoring the issue template.
-
-### 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,47 +0,0 @@
---
-name: 'Report a Windows Issue'
-about: 'Create a report for a runtime related Windows Issue'
-title: ''
-labels: 'os:win'
-assignees: ''
-
---
-
-### Important Information
-
-Provide following Information:
- mpv version
- Windows Version
- Source of the mpv binary
- If known which version of mpv introduced the problem
- Possible screenshot or video of visual glitches
-
-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
-
-Try to reproduce your issue with --no-config first. If it isn't reproducible
-with --no-config try to first find out which option or script causes your issue.
-
-Describe the reproduction steps as precise as possible. It's very likely that
-the bug you experience wasn't reproduced by the developer because the workflow
-differs from your own.
-
-### Expected behavior
-
-### Actual behavior
-
-### Log file
-
-Make a log file made with -v -v or --log-file=output.txt, paste it to
-https://0x0.st/ or attach it to the github issue, and replace this text with a
-link to it.
-
-The issue will be closed for ignoring the issue template.
-
-### 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,43 +0,0 @@
---
-name: 'Report a different Issue'
-about: 'Create a report for a runtime related Issue'
-title: ''
-labels: ''
-assignees: ''
-
---
-
-### Important Information
-
-Provide following Information:
- mpv version
- Platform and Version
- Source of the mpv binary
-
-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
-
-Try to reproduce your issue with --no-config first. If it isn't reproducible
-with --no-config try to first find out which option or script causes your issue.
-
-Describe the reproduction steps as precise as possible. It's very likely that
-the bug you experience wasn't reproduced by the developer because the workflow
-differs from your own.
-
-### Expected behavior
-
-### Actual behavior
-
-### Log file
-
-Make a log file made with -v -v or --log-file=output.txt, paste it to
-https://0x0.st/ or attach it to the github issue, and replace this text with a
-link to it.
-
-### 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,30 +0,0 @@
---
-name: 'Report a build Problem'
-about: 'Create a report for a build related Issue'
-title: ''
-labels: 'core:meson'
-assignees: ''
-
---
-
-### mpv version and platform versions
-
-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
-
-Describe the reproduction steps as precise as possible. It's very likely that
-the bug you experience wasn't reproduced by the developer because the workflow
-differs from your own.
-
-### Expected behavior
-
-### Actual behavior
-
-### Log file
-
-Upload meson-logs/meson-log.txt or meson setup build output to https://0x0.st/ or attach
-it to the github issue, and replace this text with a link to it.
-
-The issue will be closed for ignoring the issue template.
@@ -1,22 +0,0 @@
---
-name: 'Request a new Feature'
-about: 'Create a request for a new feature'
-title: ''
-labels: 'meta:feature-request'
-assignees: ''
-
---
-
-Before requesting a new feature make sure it hasn't been requested yet.
-https://github.com/mpv-player/mpv/labels/meta%3Afeature-request
-
-### Expected behavior of the wanted feature
-
-### Alternative behavior of the wanted feature
-
-### Log file
-
-Even if you think it's not necessary at first, it might help us later to find
-possible issues. Make a log file made with -v -v or --log-file=output.txt, paste
-it to https://0x0.st/ or attach it to the github issue, and replace this text
-with a link to it.
@@ -1,25 +0,0 @@
---
-name: 'Ask a Question'
-about: 'Ask a question about mpv'
-title: ''
-labels: 'meta:question'
-assignees: ''
-
---
-
-Don't ask questions about issues, errors or problems you have and instead open
-a proper issue with the right template from the previous selection.
-
-This template is meant for questions about the workings of mpv, to clarify about
-unspecified behaviour of options or command, or anything else that is not well
-described and needs clarification.
-
-Before asking a question make sure it hasn't been asked or answered yet.
-https://github.com/mpv-player/mpv/labels/meta%3Aquestion
-
-### Log file
-
-Even if you think it's not necessary at first, it might help us later to find
-possible issues. Make a log file made with -v -v or --log-file=output.txt, paste
-it to https://0x0.st/ or attach it to the github issue, and replace this text
-with a link to it.
@@ -1,9 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: mpv IRC channel
-    url: https://mpv.io/community/
-    about: Feel free to ask questions here irc://irc.libera.chat/mpv
-  - name: mpv IRC developer channel
-    url: https://mpv.io/community/
-    about: Ask questions related to the development of mpv here
-           irc://irc.libera.chat/mpv-devel
@@ -1,5 +1,7 @@
-Read this before you submit this pull request:
-https://github.com/mpv-player/mpv/blob/master/DOCS/contribute.md
+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:

-Reading this link and following the rules will get your pull request reviewed
-and merged faster. Nobody wants lazy pull requests.
+I agree that my changes can be relicensed to LGPL 2.1 or later.
@@ -1,292 +0,0 @@
-name: build
-
-on:
-  push:
-    branches:
-      - master
-      - ci
-      - 'release/**'
-    paths-ignore:
-      - 'DOCS/**'
-      - 'TOOLS/lua/**'
-  pull_request:
-    branches: [master]
-    paths-ignore:
-      - 'DOCS/**'
-      - 'TOOLS/lua/**'
-
-jobs:
-  mingw:
-    runs-on: ubuntu-22.04
-    env:
-      CCACHE_BASEDIR: ${{ github.workspace }}
-      CCACHE_DIR: ${{ github.workspace }}/.ccache
-      CCACHE_MAXSIZE: 500M
-    strategy:
-      fail-fast: false
-      matrix:
-        target: [i686-w64-mingw32, x86_64-w64-mingw32]
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Get time
-        id: get_time
-        run: echo "timestamp=`date +%s%N`" >> $GITHUB_OUTPUT
-
-      - uses: actions/cache@v3
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ${{ matrix.target }}-${{ steps.get_time.outputs.timestamp }}
-          restore-keys: ${{ matrix.target }}-
-
-      - name: Install dependencies
-        run: |
-          sudo dpkg --add-architecture i386
-          sudo apt-get update
-          sudo apt-get install -y autoconf automake pkg-config g++-mingw-w64 gcc-multilib python3-pip ninja-build nasm wine wine32 wine64 ccache
-          sudo python3 -m pip install meson
-
-      - name: Build libraries
-        run: |
-          ./ci/build-mingw64.sh
-        env:
-          TARGET: ${{ matrix.target }}
-
-      - name: Build with meson
-        id: build
-        run: |
-          ./ci/build-mingw64.sh meson pack
-        env:
-          TARGET: ${{ matrix.target }}
-
-      - name: Print meson log
-        if: ${{ failure() && steps.build.outcome == 'failure' }}
-        run: |
-          cat ./build/meson-logs/meson-log.txt
-
-      - name: Functional test
-        id: tests
-        run: |
-          cd artifact && wine64 ./mpv.com -v --no-config
-        env:
-          WINEDEBUG: '+loaddll'
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: mpv-${{ matrix.target }}
-          path: mpv-git-*.zip
-
-  macos:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        cc:
-          - "clang"
-        cxx:
-          - "clang++"
-        os:
-          - "macos-12"
-          - "macos-13"
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Remove stray upstream python binary symlinks under /usr/local
-        run: |
-          find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete -print
-          brew unlink python && brew link --overwrite python
-
-      - name: Install dependencies
-        run: |
-          brew update
-          brew install autoconf automake pkg-config libtool python freetype fribidi little-cms2 lua@5.1 libass ffmpeg meson libplacebo
-
-      - name: Build with meson
-        id: build
-        run: |
-          ./ci/build-macos.sh
-        env:
-          CC: "${{ matrix.cc }}"
-          CXX: "${{ matrix.cxx }}"
-          TRAVIS_OS_NAME: "${{ matrix.os }}"
-
-      - name: Print meson log
-        if: ${{ failure() && steps.build.outcome == 'failure' }}
-        run: |
-          cat ./build/meson-logs/meson-log.txt
-
-      - name: Run meson tests
-        id: tests
-        run: |
-          meson test -C build
-
-      - name: Print meson test log
-        if: ${{ failure() && steps.tests.outcome == 'failure' }}
-        run: |
-          cat ./build/meson-logs/testlog.txt
-
-  linux:
-    runs-on: "ubuntu-22.04"
-    container:
-      image: "registry.opensuse.org/home/mia/images/images/mpv-ci:stable-deps"
-      env:
-        CC: "${{ matrix.config.cc }}"
-        CXX: "${{ matrix.config.cxx }}"
-    strategy:
-      matrix:
-        config:
-        - {
-            cc: "gcc",
-            cxx: "g++",
-          }
-        - {
-            cc: "clang",
-            cxx: "clang++",
-          }
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install dependencies
-        run: |
-          # workaround to avoid "fatal: unsafe repository" error
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-
-      - name: Build with meson
-        id: build
-        run: |
-          ./ci/build-tumbleweed.sh
-
-      - name: Print meson log
-        if: ${{ failure() && steps.build.outcome == 'failure' }}
-        run: |
-          cat ./build/meson-logs/meson-log.txt
-
-      - name: Run meson tests
-        id: tests
-        run: |
-          meson test -C build
-
-      - name: Print meson test log
-        if: ${{ failure() && steps.tests.outcome == 'failure' }}
-        run: |
-          cat ./build/meson-logs/testlog.txt
-
-  freebsd:
-    runs-on: ubuntu-latest # until https://github.com/actions/runner/issues/385
-    timeout-minutes: 30 # avoid any weirdness with the VM
-    steps:
-    - uses: actions/checkout@v3
-    - name: Test in FreeBSD VM
-      uses: cross-platform-actions/action@v0.19.1
-      with:
-        operating_system: freebsd
-        version: '13.2'
-        run: |
-            sudo pkg update
-            sudo pkg install -y \
-                alsa-lib \
-                cmake \
-                evdev-proto \
-                ffmpeg \
-                git \
-                iconv \
-                jackit \
-                libarchive \
-                libbluray \
-                libcaca \
-                libcdio-paranoia \
-                libdvdnav \
-                libplacebo \
-                libXinerama \
-                libxkbcommon \
-                libxpresent \
-                libXv \
-                luajit \
-                meson \
-                mujs \
-                openal-soft \
-                pipewire \
-                pkgconf \
-                pulseaudio \
-                python3 \
-                rubberband \
-                sekrit-twc-zimg \
-                sdl2 \
-                sndio \
-                uchardet \
-                v4l_compat \
-                vulkan-headers \
-                wayland-protocols
-            ./ci/build-freebsd.sh
-            meson test -C build
-
-  msys2:
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sys:
-          - clang32
-          - clang64
-          - mingw32
-          - mingw64
-          - ucrt64
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-      - name: Disable autocrlf
-        shell: pwsh
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-      - uses: actions/checkout@v3
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: ${{ matrix.sys }}
-          update: true
-          install: git
-          pacboy: >-
-            angleproject:p
-            ca-certificates:p
-            cc:p
-            diffutils:p
-            ffmpeg:p
-            lcms2:p
-            libarchive:p
-            libass:p
-            libcdio-paranoia:p
-            libdvdnav:p
-            libjpeg-turbo:p
-            libplacebo:p
-            lua51:p
-            meson:p
-            ninja:p
-            pkgconf:p
-            python:p
-            rst2pdf:p
-            rubberband:p
-            shaderc:p
-            spirv-cross:p
-            uchardet:p
-            vapoursynth:p
-            vulkan:p
-
-      - name: Build with meson
-        id: build
-        run: |
-          ./ci/build-msys2.sh meson
-
-      - name: Print meson log
-        if: ${{ failure() && steps.build.outcome == 'failure' }}
-        run: |
-          cat ./build/meson-logs/meson-log.txt
-
-      - name: Run meson tests
-        id: tests
-        run: |
-          meson test -C build
-
-      - name: Print meson test log
-        if: ${{ failure() && steps.tests.outcome == 'failure' }}
-        run: |
-          cat ./build/meson-logs/testlog.txt
@@ -1,58 +0,0 @@
-name: comment
-
-on:
-  workflow_run:
-    workflows: ["build"]
-    types: [completed]
-
-jobs:
-  pr_comment:
-    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v6
-        with:
-          script: |
-            const { owner, repo } = context.repo;
-            const run_id = ${{ github.event.workflow_run.id }};
-            const pull_head_sha = '${{github.event.workflow_run.head_sha}}';
-
-            const issue_number = await(async () => {
-              const pulls = await github.rest.pulls.list({ owner, repo });
-              for await (const { data } of github.paginate.iterator(pulls)) {
-                for (const pull of data) {
-                  if (pull.head.sha === pull_head_sha) {
-                    return pull.number;
-                  }
-                }
-              }
-            })();
-            if (issue_number) {
-              core.info(`Using pull request ${issue_number}`);
-            } else {
-              return core.error(`No matching pull request found`);
-            }
-
-            const { data: { artifacts } } = await github.rest.actions.listWorkflowRunArtifacts({ owner, repo, run_id });
-            if (!artifacts.length) {
-              return core.error(`No artifacts found`);
-            }
-
-            let body = `Download the artifacts for this pull request:\n\n<details><summary>Windows</summary>\n`;
-            for (const art of artifacts) {
-              const art_link = `https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip`;
-              if (art.name.includes('w64')) {
-                body += `\n* [${art.name}](${art_link})`;
-              }
-            }
-            body += `\n</details>`;
-
-            const { data: comments } = await github.rest.issues.listComments({ repo, owner, issue_number });
-            const existing_comment = comments.find((c) => c.user.login === 'github-actions[bot]');
-            if (existing_comment) {
-              core.info(`Updating comment ${existing_comment.id}`);
-              await github.rest.issues.updateComment({ repo, owner, comment_id: existing_comment.id, body });
-            } else {
-              core.info(`Creating a comment`);
-              await github.rest.issues.createComment({ repo, owner, issue_number, body });
-            }
@@ -1,24 +0,0 @@
-name: docs
-
-on:
-  push:
-    branches:
-      - master
-      - ci
-      - 'release/**'
-    paths:
-      - 'DOCS/**'
-  pull_request:
-    branches: [master]
-    paths:
-      - 'DOCS/**'
-
-jobs:
-  check-docs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Docs
-        run: |
-          sudo apt-get install python3-docutils
-          rst2man --strip-elements-with-class=contents --halt=2 ./DOCS/man/mpv.rst mpv.1
@@ -1,22 +0,0 @@
-name: lint
-
-on:
-  push:
-    branches:
-      - master
-      - ci
-      - 'release/**'
-  pull_request:
-    branches: [master]
-
-jobs:
-  commit-msg:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 50
-
-      - name: Lint
-        run: |
-          ./ci/lint-commit-msg.py
@@ -1,3 +1,38 @@
-/subprojects/*
-!/subprojects/packagefiles
-!/subprojects/*.wrap
+*.o
+*.a
+*.d
+*.exe
+*.pyc
+.depend
+
+/config.h
+/config.mak
+/config.log
+/mpv
+/mpv.app
+/version.h
+/input/input_conf.h
+/tags
+/TAGS
+/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
+
+/waf
+/waf-*
+/waf3-*
+/build
+/.waf*
+/.lock-waf_*
+
+/old_build
+/Makefile
@@ -0,0 +1,56 @@
+language: generic
+
+os:
+  - linux
+
+services:
+  - docker
+
+sudo: required
+
+env:
+  matrix:
+    - CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci:stable-deps CI_SCRIPT=ci/build-tumbleweed.sh CC=gcc
+    - CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci:stable-deps CI_SCRIPT=ci/build-tumbleweed.sh CC=clang
+    - CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci:snapshot-deps CI_SCRIPT=ci/build-tumbleweed.sh CC=gcc
+    - CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci:snapshot-deps CI_SCRIPT=ci/build-tumbleweed.sh CC=clang
+    - CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci-mingw64:i686 CI_SCRIPT=ci/build-mingw64.sh TARGET=i686-w64-mingw32
+    - CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci-mingw64:x86_64 CI_SCRIPT=ci/build-mingw64.sh TARGET=x86_64-w64-mingw32
+  global:
+    # Coverity token
+    - secure: "H21mSRlMhk4BKS0xHZvCFGJxteCP0hRVUxTuNfM2Z9HBsyutuLEYMtViLO86VtM+Tqla3xXPzUdS4ozLwI72Ax/5ZUDXACROj73yW6QhFB5D6rLut12+FjqC7M33Qv2hl0xwgNBmR5dsm1ToP37+Wn+ecJQNvN8fkTXF+HVzOEw="
+    # Travis token for mpv.io
+    - secure: "nlTVLJK6kRhtXvhKCoJ3YdFGHuKaq/eHowfPw25hqRWuBOZd+HjHY5KIYjV7SxuKFDpJE4GpNcvA3Q31nsqomxpkLYgrwjg6TSazN7ZP+x85ZgV1QGFebrPfGm2n5UR5CAPAwFoeF3pZheLi4bajVzwq1fWW+x3grS188P9OZso="
+
+branches:
+  only:
+    - master
+    - ci
+    - coverity_scan
+    - /release\/.*$/
+
+before_install:
+  - docker pull $CONTAINER
+script:
+  - ./bootstrap.py
+  - docker run --env CC --env TARGET -v $TRAVIS_BUILD_DIR:/build $CONTAINER /bin/sh -c "cd /build && $CI_SCRIPT"
+after_failure: cat ./build/config.log
+after_script: TOOLS/travis-rebuild-website
+
+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
@@ -4,7 +4,7 @@ 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 -Dgpl=false configure switch.
+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
@@ -21,8 +21,6 @@ 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.

-See DOCS/contribute.md for binding rules wrt. licensing for contributions.
-
 For information about authors and contributors, consult the git log, which
 contains the complete SVN and CVS history as well.

@@ -31,11 +29,11 @@ contains the complete SVN and CVS history as well.
 Some libraries are GPLv2+ or GPLv3+ only. Building mpv with Samba support makes
 it GPLv3+.

-mpv can be built as LGPLv2.1+ with the -Dgpl=false 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:
+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:
 - Linux X11 video output
 - BSD audio output via OSS
 - NVIDIA/Linux hardware decoding (vdpau, although nvdec usually works)
@@ -45,14 +43,23 @@ 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 (-Dgpl=false disables them):
+The following files are still GPL only (--enable-lgpl disables them):

    audio/out/ao_jack.c             will stay GPL
    audio/out/ao_oss.c              will stay GPL
+    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)
@@ -69,6 +76,10 @@ The following files are still GPL only (-Dgpl=false disables them):
    mpv.desktop                     unknown license, probably GPLv2+
    etc/restore-old-bindings.conf   unknown license, probably GPLv2+

-None of the cases listed above affect the final binary if it's built as
+The following files contain some optional GPL code (--enable-lgpl disables it):
+
+    options/parse_commandline.c     dvd:// expansion
+
+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).
@@ -16,7 +16,7 @@ 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``, and compatibility.rst.
+Also, read the section ``Compatibility`` in ``client.h``.

 Options, commands, properties
 =============================
@@ -32,56 +32,6 @@ API changes

 ::

- --- mpv 0.37.0 ---
- 2.2    - add mpv_time_ns()
- --- mpv 0.36.0 ---
- 2.1    - add mpv_del_property()
- --- mpv 0.35.0 ---
- 2.0    - remove headers/functions of the obsolete opengl_cb API
-        - remove mpv_opengl_init_params.extra_exts field
-        - remove deprecated mpv_detach_destroy. Use mpv_destroy instead.
-        - remove obsolete mpv_suspend and mpv_resume
-        - remove deprecated SCRIPT_INPUT_DISPATCH, PAUSE and UNPAUSE, TRACKS_CHANGED
-          TRACK_SWITCHED, METADATA_UPDATE, CHAPTER_CHANGE events
- --- mpv 0.33.0 ---
- 1.109  - add MPV_RENDER_API_TYPE_SW and related (software rendering API)
-        - inactivate the opengl_cb API (always fails to initialize now)
-          The opengl_cb API was deprecated over 2 years ago. Use the render API
-          instead.
- 1.108  - Deprecate MPV_EVENT_IDLE
-        - add mpv_event_start_file
-        - add the following fields to mpv_event_end_file: playlist_entry_id,
-          playlist_insert_id, playlist_insert_num_entries
-        - add mpv_event_to_node()
-        - add mpv_client_id()
- 1.107  - Remove the deprecated qthelper.hpp. This was obviously not part of the
-          libmpv API, only an "additionally" provided helper, thus this is not
-          considered an API change. If you are maintaining a project that relies
-          on this header, you can simply download this file and adjust the
-          include statement to use it instead:
-
-            https://raw.githubusercontent.com/mpv-player/mpv/v0.32.0/libmpv/qthelper.hpp
-
-          It is a good idea to write better wrappers for your use, though.
- --- mpv 0.31.0 ---
- 1.107  - Deprecate MPV_EVENT_TICK
- --- mpv 0.30.0 ---
- 1.106  - Add cancel_fn to mpv_stream_cb_info
- 1.105  - Fix deadlock problems with MPV_RENDER_PARAM_ADVANCED_CONTROL and if
-          the "vd-lavc-dr" option is enabled (which it is by default).
-          There were no actual API changes.
-          API users on older API versions and mpv releases should set
-          "vd-lavc-dr" to "no" to avoid these issues.
-          API users must still adhere to the tricky rules documented in render.h
-          to avoid other deadlocks.
- 1.104  - Deprecate struct mpv_opengl_drm_params. Replaced by mpv_opengl_drm_params_v2
-        - Deprecate MPV_RENDER_PARAM_DRM_DISPLAY. Replaced by MPV_RENDER_PARAM_DRM_DISPLAY_V2.
- 1.103  - redo handling of async commands
-        - add mpv_event_command and make it possible to return values from
-          commands issued with mpv_command_async() or mpv_command_node_async()
-        - add mpv_abort_async_command()
- 1.102  - rename struct mpv_opengl_drm_osd_size to mpv_opengl_drm_draw_surface_size
-        - rename MPV_RENDER_PARAM_DRM_OSD_SIZE to MPV_RENDER_PARAM_DRM_DRAW_SURFACE_SIZE
 --- mpv 0.29.0 ---
 1.101  - add MPV_RENDER_PARAM_ADVANCED_CONTROL and related API
        - add MPV_RENDER_PARAM_NEXT_FRAME_INFO and related symbols
@@ -1,177 +0,0 @@
-CLI and API compatibility policy
-================================
-
-Human users and API users rely on the mpv/libmpv/scripting/IPC interface not
-breaking their use case. On the other hand, active development occasionally
-requires breaking things, such as removing old options or changing options in
-a way that may break.
-
-This document lists rules when, what, and how incompatible changes can be made.
-It's interesting both for mpv developers, who want to change user-visible parts,
-and mpv users, who want to know what is guaranteed to remain stable.
-
-Any of the rules below may be overridden by statements in more specific
-documentation (for example, if the manpage says that a particular option may be
-removed any time, it means that, and the option probably won't even go through
-deprecation).
-
-Additions
---------
-
-Additions are basically always allowed. API users etc. are supposed to deal with
-the possibility that for example new API functions are added. Some parts of the
-API may document how they are extended.
-
-Options, commands, properties, events, hooks (command interface)
----------------------------------------------------------------
-
-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.
-
-All incompatible changes to this must be declared in interface-changes.rst.
-(This may also list compatible additions, but it's not a requirement.)
-
-Degrees of importance and compatibility preservation
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Critical and central parts of the command interface have the strictest
-requirements. It may not be reasonable to break them, and other means to achieve
-some change have to be found. For example, the "seek" command is a bit of a
-mess, but since changing it would likely affect almost every user, it may be
-impossible to break at least the commonly used syntax. If changed anyway, there
-should be a deprecation period of at least 1 year, during which the command
-still works, and possibly a warning should remain even after this.
-
-Important/often used parts must be deprecated for at least 2 releases before
-they can be broken. There must be at least 1 release where the deprecated
-functionality still works, and a replacement is available (if technically
-reasonable). For example, a feature deprecated in mpv 0.30.0 may be removed in
-mpv 0.32.0. Minor releases do not count towards this.
-
-Less useful parts can be broken immediately, but must come with some sort of
-removal warning-
-
-Parts for debugging and testing may be removed any time, potentially even
-without any sort of documentation.
-
-Currently, the importance of a part is not documented and not even well-defined,
-which is probably a mistake.
-
-Renaming or removing options
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Typically, renaming an option can be done in a compatible way with OPT_REPLACED.
-You may need to check whether the corresponding properties still work (including
-messy details like observing properties for changes).
-
-OPT_REMOVED can be used to inform the user of alternatives or reasons for the
-removal, which is better than an option not found error. Likewise,
-m_option.deprecation_message should be set to something helpful.
-
-Both OPT_REPLACED and OPT_REMOVED can remain in the code for a long time, since
-they're unintrusive and hopefully make incompatible changes less painful for
-users.
-
-Scripting APIs
--------------
-
-This affects internal scripting APIs (currently Lua and JavaScript).
-
-Vaguely the same rules as with the command interface apply. Since there is a
-large number of scripts, an effort should be made to provide compatibility
-for old scripts, but it does not need to be stronger than that of the command
-interface.
-
-Undocumented parts of the scripting APIs are _not_ guaranteed for compatibility.
-This applies especially for internals. Languages like Lua do not have strict
-access control (nor does the mpv code try to emulate any), so if a script
-accesses private parts, and breaks on the next mpv release, it's not mpv's
-problem.
-
-JSON IPC
--------
-
-The JSON IPC is a thin protocol wrapping the libmpv API and the command
-interface. Compatibility-wise, it's about the same as the scripting APIs.
-The JSON protocol commands should remain as compatible as possible, and it
-should probably accept the current way commands are delimited (line breaks)
-forever.
-
-The protocol may accept non-standard JSON extensions, but only standard JSON
-(possibly with restrictions) is guaranteed for compatibility. Clients which want
-to remain compatible should not use any extensions.
-
-CLI
---
-
-Things such as default key bindings do not necessarily require compatibility.
-However, the release notes should be extremely clear on changes to "important"
-key bindings. Bindings which restore the old behavior should be added to
-restore-old-bindings.conf.
-
-Some option parsing is CLI-only and not available from libmpv or scripting. No
-compatibility guarantees come with them. However, the rules which mpv uses to
-distinguish between options and filenames must remain consistent (if the
-non-deprecated options syntax is used).
-
-Terminal and log output
-----------------------
-
-There are no compatibility guarantees for the terminal output, or the text
-logged via ``MPV_EVENT_LOG_MESSAGE`` and similar APIs. In particular, scripts
-invoking mpv CLI are extremely discouraged from trying to parse text output,
-and should use other mechanisms such as the JSON IPC.
-
-Protocols, filters, demuxers, etc.
----------------------------------
-
-Which of these are present is generally not guaranteed, and can even depend
-on compile time settings.
-
-The filter list and their sub-options are considered part of the
-command-interface.
-
-libmpv C API
------------
-
-The libmpv client API (such as ``<libmpv/client.h>``) mostly gives access to
-the command interface. The API itself (if looked at as a component separate
-from the command interface) is intended to be extremely stable.
-
-All API changes are documented in client-api-changes.rst.
-
-API compatibility
-^^^^^^^^^^^^^^^^^
-
-The API is *always* compatible. Incompatible changes are only allowed on major
-API version changes (see ``MPV_CLIENT_API_VERSION``). A major version change is
-an extremely rare event, which means usually no API symbols are ever removed.
-
-Essentially removing API functions by making them always return an error, or
-making it do nothing is allowed in cases where it is unlikely to break most
-clients, but requires a deprecation period of 2 releases. (This has happened to
-``mpv_suspend()`` for example.)
-
-API symbols can be deprecated. This should be clearly marked in the doxygen
-with ``@deprecated``, and if possible, the affected API symbols should not be
-visible if the API user defines ``MPV_ENABLE_DEPRECATED`` to 0.
-
-ABI compatibility
-^^^^^^^^^^^^^^^^^
-
-The ABI must never be broken, except on major API version changes. For example,
-constants don't change their values.
-
-Structs are tricky. If a struct can be allocated by a user (such as ``mpv_node``),
-no fields can be added. (Unless it's an union, and the addition does not change
-the offset or alignment of any of the fields or the struct itself. This has
-happened to ``mpv_node`` in the past.) If a struct is allocated by libmpv only,
-new fields can be appended to the end (for example ``mpv_event``).
-
-The ABI is only backward compatible. This means if a host application is linked
-to an older libmpv, and libmpv is updated to a newer version, it will still
-work (as in not causing any undefined behavior).
-
-Forward compatibility (an application would work with an older libmpv than it
-was linked to) is not required.
@@ -4,43 +4,28 @@ 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:
-https://www.mingw-w64.org/
+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 (https://osdn.net/projects/mingw/) is unsupported.
+**Warning**: the original MinGW (http://www.mingw.org) is unsupported.

 Cross-compilation
 =================

-When cross-compiling, it is recommended to use a meson crossfile to setup
-the cross compiling environment. A minimal example is included below:
+When cross-compiling, you have to run mpv's configure with these arguments:

-```ini
-[binaries]
-c = 'x86_64-w64-mingw32-gcc'
-cpp = 'x86_64-w64-mingw32-g++'
-ar = 'x86_64-w64-mingw32-ar'
-strip = 'x86_64-w64-mingw32-strip'
-exe_wrapper = 'wine64'
-
-[host_machine]
-system = 'windows'
-cpu_family = 'x86_64'
-cpu = 'x86_64'
-endian = 'little'
+```bash
+DEST_OS=win32 TARGET=i686-w64-mingw32 ./waf configure
 ```

-See [meson's documentation](https://mesonbuild.com/Cross-compilation.html) for
-more information.
-
-[MXE](https://mxe.cc) makes it very easy to bootstrap a complete MingGW-w64
+[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 [mpv-winbuild-cmake](https://github.com/shinchiro/mpv-winbuild-cmake),
+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
@@ -53,7 +38,7 @@ Example with MXE
 #
 # Refer to
 #
-#    https://mxe.cc/#requirements
+#    http://mxe.cc/#requirements
 #
 # Scroll down for disto/OS-specific instructions to install them.

@@ -83,7 +68,7 @@ echo "MXE_TARGETS := i686-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 luajit
+make gcc ffmpeg libass jpeg lua

 # Add MXE binaries to $PATH
 export PATH=/opt/mxe/usr/bin/:$PATH
@@ -94,8 +79,11 @@ export PATH=/opt/mxe/usr/bin/:$PATH
 cd ..
 git clone https://github.com/mpv-player/mpv.git
 cd mpv
-meson setup build --crossfile crossfile
-meson compile -C build
+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
@@ -111,7 +99,7 @@ To build 64-bit mpv on Windows:
 Installing MSYS2
 ----------------

-1. Download an installer from https://www.msys2.org/
+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
@@ -144,49 +132,54 @@ Installing mpv dependencies

 ```bash
 # Install MSYS2 build dependencies and a MinGW-w64 compiler
-pacman -S git $MINGW_PACKAGE_PREFIX-{python,pkgconf,gcc,meson}
+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,luajit}
+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
-meson setup build --prefix=$MSYSTEM_PREFIX
-meson compile -C build
+/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
-meson setup build -Dlibmpv=true --prefix=$MSYSTEM_PREFIX
-meson compile -C build
-meson install -C build
+/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
 ---------------------------------

-mpv/libmpv cannot be built with Visual Studio (Microsoft is too incompetent to
-support C99/C11 properly and/or hates open source and Linux too much to
-seriously do it). But you can build C++ programs in Visual Studio and link them
-with a libmpv built with MinGW.
-
-To do this, you need a Visual Studio which supports ``stdint.h`` (recent ones do),
+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 /name:mpv-1.dll /out:mpv.lib /MACHINE:X64
+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).
+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.

@@ -211,4 +204,6 @@ 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.
+mpv you compiled. You can find copies here:
+
+https://mpv.srsfckn.biz/d3dcompiler.7z
@@ -5,60 +5,35 @@ General
 -------

 The main contact for mpv development is IRC, specifically #mpv
-and #mpv-devel on Libera.chat. Github is used for code review and
-long term discussions.
+and #mpv-devel on Freenode.

 Sending patches
 ---------------

 - Make a github pull request, or send a link to a plaintext patch created with
-  ``git format-patch``.
- Plain diffs posted as pastebins are not acceptable! (Especially if the http
-  link returns HTML.) They only cause extra work for everyone, because they lack
-  commit message and authorship information.
- Never send patches to any of the developers email addresses.
- If your changes are not supposed to be merged immediately, mark them as
-  "[RFC]" in the commit message or the pull request title.
- Be sure to test your changes. If you didn't, please say so in the commit
-  message and the pull request text.
-
-Copyright of contributions
--------------------------
-
- The copyright belongs to contributors. The project is a collaborative work. By
-  sending your changes, you agree to license your contributions according to the
-  requirements of this project.
+  ``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).
- 100% compatible licenses are allowed too.
- Changes in files with more liberal licenses (such as BSD, MIT, or ISC) are
-  assumed to be dual-licensed under LGPLv2.1+ and the license indicated in the
-  file header.
 - 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 you're making changes on
-  behalf of your employer, and the employer owns the copyright, you must mention
-  this. If the license of the code is not LGPLv2.1+, you must mention this.
- These license statements are legally binding.
- Don't use fake names (something that looks like an actual name, and may be
+  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.
- Do not add your name to the license header. This convention is not used by
-  this project, and neither copyright law nor any of the used licenses require
-  it.
-
-Write good commit messages
--------------------------
-
+- 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) must contain a
+- 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
-  must not be longer than 72 characters per line, because it messes up the
+  shouldn't be longer than 72 characters per line, because it messes up the
  output of many git tools otherwise.

  For example, you fixed a crash in af_volume.c:
@@ -68,16 +43,7 @@ Write good commit messages

  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``.
-
-  Sample prefixes: ``vo_gpu: ...``, ``command: ...``, ``DOCS/input: ...``,
-  ``TOOLS/osxbundle: ...``, ``osc.lua: ...``, etc. You can always check the git
-  log for commits which modify specific files to see which prefixes are used.
-
- The first word after the ``:`` is lower case.
- Don't end the subject line with a ``.``.
- Put an empty line between the subject line and the commit message.
-  If this is missing, it will break display in common git tools.
- The body of the commit message (everything else after the subject line) must
+- The body of the commit message (everything else after the subject line) should
  be as informative as possible and contain everything that isn't obvious. Don't
  hesitate to dump as much information as you can - it doesn't cost you
  anything. Put some effort into it. If someone finds a bug months or years
@@ -86,66 +52,35 @@ Write good commit messages
  information to test the original bug. The old bug might be reintroduced while
  fixing the new bug.

-  The commit message must be wrapped on 72 characters per line, because git
+  The commit message should be wrapped on 72 characters per line, because git
  tools usually do not break text automatically. On the other hand, you do not
  need to break text that would be unnatural to break (like data for test cases,
  or long URLs).
- Another summary of good conventions: https://chris.beams.io/posts/git-commit/

-Split changes into multiple commits
-----------------------------------
-
- Follow git good practices, and split independent changes into several commits.
-  It's usually OK to put them into a single pull request.
+  Important: put an empty line between the subject line and the commit message.
+  If this is missing, it will break display in common git tools.
 - Try to separate cosmetic and functional changes. It's ok to make a few
  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.
- Splitting changes does _not_ mean that you should make them as fine-grained
-  as possible. Commits should form logical steps in development. The way you
-  split changes is important for code review and analyzing bugs.
-
-Always squash fixup commits when making changes to pull requests
----------------------------------------------------------------
-
- If you make fixup commits to your pull request, you should generally squash
-  them with "git rebase -i". We prefer to have pull requests in a merge
-  ready state.
- We don't squash-merge (nor do we use github's feature that does this) because
-  pull requests with multiple commits are perfectly legitimate, and the only
-  thing that makes sense in non-trivial cases.
- With complex pull requests, it *may* make sense to keep them separate, but
-  they should be clearly marked as such. Reviewing commits is generally easier
-  with fixups squashed.
- Reviewers are encouraged to look at individual commits instead of github's
-  "changes from all commits" view (which just encourages bad git and review
-  practices).
-
-Touching user-visible parts may require updating the mpv docs
-------------------------------------------------------------
-
- Most user-visible things are normally documented in DOCS/man/. If your commit
-  touches documented behavior, list of sub-options, etc., you need to adjust the
-  documentation.
- These changes usually go into the same commit that changes the code.
 - 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 incompatible changes to the user interface (options, properties, commands)
-  must be documented with a small note in interface-changes.rst. (Additions may
-  be documented there as well, but this isn't required.)
- Changes to the libmpv API must be reflected in the libmpv's headers doxygen,
-  and in client-api-changes.rst.
+  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.

 Code formatting
 ---------------

-mpv uses C11 with K&R formatting, with some exceptions.
+mpv uses C99 with K&R formatting, with some exceptions.

 - Use the K&R indent style.
 - Use 4 spaces of indentation, never use tabs (except in Makefiles).
 - Add a single space between keywords and binary operators. There are some other
-  cases where spaces must be added. Example:
+  cases where spaces should be added. Example:

    ```C
    if ((a * b) > c) {
@@ -153,9 +88,9 @@ mpv uses C11 with K&R formatting, with some exceptions.
        some_function(a, b, c);
    }
    ```
- Break lines on 80 columns. There is a hard limit of 100 columns. You may ignore
+- Break lines on 80 columns. There is a hard limit of 85 columns. You may ignore
  this limit if there's a strong case that not breaking the line will increase
-  readability. Going over 100 columns might provoke endless discussions about
+  readability. Going over 85 columns might provoke endless discussions about
  whether such a limit is needed or not, so avoid it.
 - If the body of an if/for/while statement has more than 1 physical lines, then
  always add braces, even if they're technically redundant.
@@ -178,7 +113,7 @@ mpv uses C11 with K&R formatting, with some exceptions.
            do_something();
    }
    ```
- If the if has an else branch, both branches must use braces, even if they're
+- If the if has an else branch, both branches should use braces, even if they're
  technically redundant.

  Example:
@@ -208,32 +143,18 @@ mpv uses C11 with K&R formatting, with some exceptions.

  (If the if body is simple enough, this rule can be skipped.)
 - Remove any trailing whitespace.
- Do not make stray whitespaces changes.
-
-Header #include statement order
-------------------------------
-
-The order of ``#include`` statements in the source code is not very consistent.
-New code must follow the following conventions:
-
- Put standard includes (``#include <stdlib.h>`` etc.) on the top,
- then after a blank line, add library includes (``#include <zlib.h>`` etc.)
- then after a blank line, add internal includes (``#include "player/core.h"``)
- sort them alphabetically within these sections

 General coding
 --------------

- Use C11. Also freely make use of C11 features if it's appropriate, but do not
-  use VLA and complex number types.
- Don't use non-standard language (such as GNU C-only features). In some cases
-  they may be warranted, if they are optional (such as attributes enabling
-  printf-like format string checks). "#pragma once" is allowed as an exception.
-  But in general, standard C11 must be used.
+- Use C99. Also freely make use of C99 features if it's appropriate, such as
+  stdbool.h.
+- Don't use GNU-only features. In some cases they may be warranted, if they
+  are optional (such as attributes enabling printf-like format string checks).
+  But in general, standard C99 should be used.
 - The same applies to libc functions. We have to be Windows-compatible too. Use
-  functions guaranteed by C11 or POSIX only, unless your use is guarded by a
-  configure check. Be mindful of MinGW-specifics since C11 support is not always
-  guaranteed.
+  functions guaranteed by C99 or POSIX only, unless your use is guarded by a
+  configure check.
 - 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.
@@ -241,14 +162,6 @@ General coding
  channel first. There might be a better way to add a feature and it can avoid
  wasted work.

-Code of Conduct
---------------
-
-Please note that this project is released with a Contributor Code of Conduct.
-By participating in this project you agree to abide by its terms.
-The Contributor Code of Conduct can be found here:
-https://www.contributor-covenant.org/version/2/0/code_of_conduct/
-
 Rules for git push access
 -------------------------

@@ -267,9 +180,7 @@ you got access, the following rules must be followed:
  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.
- If you make a pull requests (especially if it's to code you maintain), and you
-  want reviews, explicitly ping the people from which you expect reviews.
- As a maintainer, you can approve pull requests by others to "your" code.
+- 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
@@ -100,18 +100,6 @@ 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.

-Disabling chapter generation and copying
-========================================
-
-By default, chapters from the source ranges are copied to the virtual file's
-chapters. Also, a chapter is inserted after each range. This can be disabled
-with the ``no_chapters`` header.
-
-Example::
-
-    !no_chapters
-
-
 MP4 DASH
 ========

@@ -143,184 +131,6 @@ The current implementation will
 - not add segment boundaries as chapter points
 - require full compatibility between all segments (same codec etc.)

-Another header part of this mechanism is ``no_clip``. This header is similar
-to ``mp4_dash``, but does not include on-demand opening/closing of segments,
-and does not support init segments. It also exists solely to support internal
-ytdl requirements. Using ``no_clip`` with segments is not recommended and
-probably breaks. ``mp4_dash`` already implicitly does a variant of ``no_clip``.
-
-The ``mp4_dash`` and ``no_clip`` headers are not part of the core EDL format.
-They may be changed or removed at any time, depending on mpv's internal
-requirements.
-
-Separate files for tracks
-=========================
-
-The special ``new_stream`` header lets you specify separate parts and time
-offsets for separate tracks. This can for example be used to source audio and
-video track from separate files.
-
-Example::
-
-    # mpv EDL v0
-    video.mkv
-    !new_stream
-    audio.mkv
-
-This adds all tracks from both files to the virtual track list. Upon playback,
-the tracks will be played at the same time, instead of appending them. The files
-can contain more than 1 stream; the apparent effect is the same as if the second
-part after the ``!new_stream`` part were in a separate ``.edl`` file and added
-with ``--external-file``.
-
-Note that all metadata between the stream sets created by ``new_stream`` is
-disjoint. Global metadata is taken from the first part only.
-
-In context of mpv, this is redundant to the ``--audio-file`` and
-``--external-file`` options, but (as of this writing) has the advantage that
-this will use a unified cache for all streams.
-
-The ``new_stream`` header is not part of the core EDL format. It may be changed
-or removed at any time, depending on mpv's internal requirements.
-
-If the first ``!new_stream`` is redundant, it is ignored. This is the same
-example as above::
-
-    # mpv EDL v0
-    !new_stream
-    video.mkv
-    !new_stream
-    audio.mkv
-
-Note that ``!new_stream`` must be the first header. Whether the parser accepts
-(i.e. ignores) or rejects other headers before that is implementation specific.
-
-Track metadata
-==============
-
-The special ``track_meta`` header can set some specific metadata fields of the
-current ``!new_stream`` partition. The tags are applied to all tracks within
-the partition. It is not possible to set the metadata for individual tracks (the
-feature was needed only for single-track media).
-
-It provides following parameters change track metadata:
-
-``lang``
-    Set the language tag.
-
-``title``
-    Set the title tag.
-
-``byterate``
-    Number of bytes per second this stream uses. (Purely informational.)
-
-``index``
-    The numeric index of the track this should map to (default: -1). This is
-    the 0-based index of the virtual stream as seen by the player, enumerating
-    all audio/video/subtitle streams. If nothing matches, this is silently
-    discarded. The special index -1 (the default) has two meanings: if there
-    was a previous meta data entry (either ``!track_meta`` or ``!delay_open``
-    element since the last ``!new_stream``), then this element manipulates
-    the previous meta data entry. If there was no previous entry, a new meta
-    data entry that matches all streams is created.
-
-Example::
-
-    # mpv EDL v0
-    !track_meta,lang=bla,title=blabla
-    file.mkv
-    !new_stream
-    !track_meta,title=ducks
-    sub.srt
-
-If ``file.mkv`` has an audio and a video stream, both will use ``blabla`` as
-title. The subtitle stream will use ``ducks`` as title.
-
-The ``track_meta`` header is not part of the core EDL format. It may be changed
-or removed at any time, depending on mpv's internal requirements.
-
-Global metadata
-===============
-
-The special ``global_tags`` header can set metadata fields (aka tags) of the EDL
-file. This metadata is supposed to be informational, much like for example ID3
-tags in audio files. Due to lack of separation of different kinds of metadata it
-is unspecified what names are allowed, how they are interpreted, and whether
-some of them affect playback functionally. (Much of this is unfortunately
-inherited from FFmpeg. Another consequence of this is that FFmpeg "normalized"
-tags are recognized, or stuff like replaygain tags.)
-
-Example::
-
-    !global_tags,title=bla,something_arbitrary=even_more_arbitrary
-
-Any parameter names are allowed. Repeated use of this adds to the tag list. If
-``!new_stream`` is used, the location doesn't matter.
-
-May possibly be ignored in some cases, such as delayed media opening.
-
-Delayed media opening
-=====================
-
-The special ``delay_open`` header can be used to open the media URL of the
-stream only when the track is selected for the first time. This is supposed to
-be an optimization to speed up opening of a remote stream if there are many
-tracks for whatever reasons.
-
-This has various tricky restrictions, and also will defer failure to open a
-stream to "later". By design, it's supposed to be used for single-track streams.
-
-Using multiple segments requires you to specify all offsets and durations (also
-it was never tested whether it works at all). Interaction with ``mp4_dash`` may
-be strange.
-
-You can describe multiple sub-tracks by using multiple ``delay_open`` headers
-before the same source URL. (If there are multiple sub-tracks of the same media
-type, then the mapping to the real stream is probably rather arbitrary.) If the
-source contains tracks not described, a warning is logged when the delayed
-opening happens, and the track is hidden.
-
-This has the following parameters:
-
-``media_type``
-    Required. Must be set to ``video``, ``audio``, or ``sub``. (Other tracks in
-    the opened URL are ignored.)
-
-``codec``
-    The mpv codec name that is expected. Although mpv tries to initialize a
-    decoder with it currently (and will fail track selection if it does not
-    initialize successfully), it is not used for decoding - decoding still uses
-    the information retrieved from opening the actual media information, and may
-    be a different codec (you should try to avoid this, of course). Defaults to
-    ``null``.
-
-    Above also applies for similar fields such as ``w``.  These fields are
-    mostly to help with user track pre-selection.
-
-``flags``
-    A ``+`` separated list of boolean flags. Currently defined flags:
-
-        ``default``
-            Set the default track flag.
-
-        ``forced``
-            Set the forced track flag.
-
-    Other values are ignored after triggering a warning.
-
-``w``, ``h``
-    For video codecs: expected video size. See ``codec`` for details.
-
-``fps``
-    For video codecs: expected video framerate, as integer. (The rate is usually
-    only crudely reported, and it makes no sense to expect exact values.)
-
-``samplerate``
-    For audio codecs: expected sample rate, as integer.
-
-The ``delay_open`` header is not part of the core EDL format. It may be changed
-or removed at any time, depending on mpv's internal requirements.
-
 Timestamp format
 ================

@@ -328,8 +138,7 @@ Currently, time values are floating point values in seconds.

 As an extension, you can set the ``timestamps=chapters`` option. If this option
 is set, timestamps have to be integers, and refer to chapter numbers, starting
-with 0. The default value for this parameter is ``seconds``, which means the
-time is as described in the previous paragraph.
+with 0.

 Example::

@@ -338,54 +147,6 @@ Example::

 Plays chapter 3 and ends with the start of chapter 7 (4 chapters later).

-Implicit chapters
-=================
-
-mpv will add one chapter per segment entry to the virtual timeline.
-
-By default, the chapter's titles will match the entries' filenames.
-You can override set the ``title`` option to override the chapter title for
-that segment.
-
-Example::
-
-    # mpv EDL v0
-    cap.ts,5,240
-    OP.mkv,0,90,title=Show Opening
-
-The virtual timeline will have two chapters, one called "cap.ts" from 0-240s
-and a second one called "Show Opening" from 240-330s.
-
-Entry which defines the track layout
-====================================
-
-Normally, you're supposed to put only files with compatible layouts into an EDL
-file. However, at least the mpv implementation accepts entries that use
-different codecs, or even have a different number of audio/video/subtitle
-tracks. In this case, it's not obvious, which virtual tracks the EDL show should
-expose when being played.
-
-Currently, mpv will apply an arbitrary heuristic which tracks the EDL file
-should expose. (Before mpv 0.30.0, it always used the first source file in the
-segment list.)
-
-You can set the ``layout`` option to ``this`` to make a specific entry define
-the track layout.
-
-Example::
-
-    # mpv EDL v0
-    file_with_2_streams.ts,5,240
-    file_with_5_streams.mkv,0,90,layout=this
-
-The way the different virtual EDL tracks are associated with the per-segment
-ones is highly implementation-defined, and uses a heuristic. If a segment is
-missing a track, there will be a "hole", and bad behavior may result. Improving
-this is subject to further development (due to being fringe cases, they don't
-have a high priority).
-
-If future versions of mpv change this again, this option may be ignored.
-
 Syntax of EDL URIs
 ==================

@@ -3,26 +3,26 @@ General usage

 ::

-  mpv infile --o=outfile [--of=outfileformat] [--ofopts=formatoptions] [--orawts] \
+  mpv infile -o outfile [-of outfileformat] [-ofopts formatoptions] [-orawts] \
    [(any other mpv options)] \
-    --ovc=outvideocodec [--ovcopts=outvideocodecoptions] \
-    --oac=outaudiocodec [--oacopts=outaudiocodecoptions]
+    -ovc outvideocodec [-ovcopts outvideocodecoptions] \
+    -oac outaudiocodec [-oacopts outaudiocodecoptions]

 Help for these options is provided if giving help as parameter, as in::

-  mpv --ovc=help
+  mpv -ovc help

 The suboptions of these generally are identical to ffmpeg's (as option parsing
-is simply delegated to ffmpeg). The option --ocopyts enables copying timestamps
+is simply delegated to ffmpeg). The option -ocopyts enables copying timestamps
 from the source as-is, instead of fixing them to match audio playback time
-(note: this doesn't work with all output container formats); --orawts even turns
+(note: this doesn't work with all output container formats); -orawts even turns
 off discontinuity fixing.

-Note that if neither --ofps nor --oautofps is specified, VFR encoding is assumed
-and the time base is 24000fps. --oautofps sets --ofps to a guessed fps number
+Note that if neither -ofps nor -oautofps is specified, VFR encoding is assumed
+and the time base is 24000fps. -oautofps sets -ofps to a guessed fps number
 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.
+-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
 section::
@@ -30,13 +30,9 @@ section::
  [myencprofile]
  vf-add = scale=480:-2
  ovc = libx264
-  ovcopts-add = preset=medium
-  ovcopts-add = tune=fastdecode
+  ovcopts-add = preset=medium,tune=fastdecode
  ovcopts-add = crf=23
-  ovcopts-add = maxrate=1500k
-  ovcopts-add = bufsize=1000k
-  ovcopts-add = rc_init_occupancy=900k
-  ovcopts-add = refs=2
+  ovcopts-add = maxrate=1500k,bufsize=1000k,rc_init_occupancy=900k,refs=2
  ovcopts-add = profile=baseline
  oac = aac
  oacopts-add = b=96k
@@ -48,7 +44,7 @@ to encoding. This is not the case anymore.)

 One can then encode using this profile using the command::

-  mpv infile --o=outfile.mp4 --profile=myencprofile
+  mpv infile -o outfile.mp4 -profile myencprofile

 Some example profiles are provided in a file
 etc/encoding-profiles.conf; as for this, see below.
@@ -62,10 +58,10 @@ for.

 Typical MPEG-4 Part 2 ("ASP", "DivX") encoding, AVI container::

-  mpv infile --o=outfile.avi \
+  mpv infile -o outfile.avi \
    --vf=fps=25 \
-    --ovc=mpeg4 --ovcopts=qscale=4 \
-    --oac=libmp3lame --oacopts=b=128k
+    -ovc mpeg4 -ovcopts qscale=4 \
+    -oac libmp3lame -oacopts ab=128k

 Note: AVI does not support variable frame rate, so the fps filter must be used.
 The frame rate should ideally match the input (25 for PAL, 24000/1001 or
@@ -73,22 +69,22 @@ The frame rate should ideally match the input (25 for PAL, 24000/1001 or

 Typical MPEG-4 Part 10 ("AVC", "H.264") encoding, Matroska (MKV) container::

-  mpv infile --o=outfile.mkv \
-    --ovc=libx264 --ovcopts=preset=medium,crf=23,profile=baseline \
-    --oac=libopus --oacopts=qscale=3
+  mpv infile -o outfile.mkv \
+    -ovc libx264 -ovcopts preset=medium,crf=23,profile=baseline \
+    -oac libvorbis -oacopts qscale=3

 Typical MPEG-4 Part 10 ("AVC", "H.264") encoding, MPEG-4 (MP4) container::

-  mpv infile --o=outfile.mp4 \
-    --ovc=libx264 --ovcopts=preset=medium,crf=23,profile=baseline \
-    --oac=aac --oacopts=b=128k
+  mpv infile -o outfile.mp4 \
+    -ovc libx264 -ovcopts preset=medium,crf=23,profile=baseline \
+    -oac aac -oacopts ab=128k

 Typical VP8 encoding, WebM (restricted Matroska) container::

  mpv infile -o outfile.mkv \
-    --of=webm \
-    --ovc=libvpx --ovcopts=qmin=6,b=1000000k \
-    --oac=libopus --oacopts=qscale=3
+    -of webm \
+    -ovc libvpx -ovcopts qmin=6,b=1000000k \
+    -oac libvorbis -oacopts qscale=3


 Device targets
@@ -111,18 +107,18 @@ section.
 Refer to the top of that file for more comments - in a nutshell, the following
 options are added by it::

-  --profile=enc-to-dvdpal      # DVD-Video PAL, use dvdauthor -v pal+4:3 -a ac3+en
-  --profile=enc-to-dvdntsc     # DVD-Video NTSC, use dvdauthor -v ntsc+4:3 -a ac3+en
-  --profile=enc-to-bb-9000     # MP4 for Blackberry Bold 9000
-  --profile=enc-to-nok-6300    # 3GP for Nokia 6300
-  --profile=enc-to-psp         # MP4 for PlayStation Portable
-  --profile=enc-to-iphone      # MP4 for iPhone
-  --profile=enc-to-iphone-4    # MP4 for iPhone 4 (double res)
-  --profile=enc-to-iphone-5    # MP4 for iPhone 5 (even larger res)
+  -profile enc-to-dvdpal      DVD-Video PAL, use dvdauthor -v pal+4:3 -a ac3+en
+  -profile enc-to-dvdntsc     DVD-Video NTSC, use dvdauthor -v ntsc+4:3 -a ac3+en
+  -profile enc-to-bb-9000     MP4 for Blackberry Bold 9000
+  -profile enc-to-nok-6300    3GP for Nokia 6300
+  -profile enc-to-psp         MP4 for PlayStation Portable
+  -profile enc-to-iphone      MP4 for iPhone
+  -profile enc-to-iphone-4    MP4 for iPhone 4 (double res)
+  -profile enc-to-iphone-5    MP4 for iPhone 5 (even larger res)

 You can encode using these with a command line like::

-  mpv infile --o=outfile.mp4 --profile=enc-to-bb-9000
+  mpv infile -o outfile.mp4 -profile enc-to-bb-9000

 Of course, you are free to override options set by these profiles by specifying
 them after the -profile option.
@@ -133,19 +129,19 @@ What works

 * Encoding at variable frame rate (default)
 * Encoding at constant frame rate using --vf=fps=RATE
-* 2-pass encoding (specify flags=+pass1 in the first pass's --ovcopts, specify
+* 2-pass encoding (specify flags=+pass1 in the first pass's -ovcopts, specify
  flags=+pass2 in the second pass)
 * Hardcoding subtitles using vobsub, ass or srt subtitle rendering (just
  configure mpv for the subtitles as usual)
-* Hardcoding any other mpv OSD (e.g. time codes, using --osdlevel=3 and
-  --vf=expand=::::1)
+* Hardcoding any other mpv OSD (e.g. time codes, using -osdlevel 3 and -vf
+  expand=::::1)
 * Encoding directly from a DVD, network stream, webcam, or any other source
  mpv supports
 * Using x264 presets/tunings/profiles (by using profile=, tune=, preset= in the
-  --ovcopts)
+  -ovcopts)
 * Deinterlacing/Inverse Telecine with any of mpv's filters for that
-* Audio file converting: mpv --o=outfile.m4a infile.flac --no-video
-  --oac=aac --oacopts=b=320k
+* Audio file converting: mpv -o outfile.mp3 infile.flac -no-video -oac
+  libmp3lame -oacopts ab=320k

 What does not work yet
 ======================
@@ -7,432 +7,20 @@ mpv provides access to its internals via the following means:
 - commands
 - properties
 - events
- hooks
-
-The sum of these mechanisms is sometimes called command interface.

 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.

-Also see compatibility.rst.
-
-This document lists changes to them. New changes are added to the top. Usually,
-only incompatible or important changes are mentioned. New options/commands/etc.
-are not always listed.
+This document lists changes to them. New changes are added to the top.

 Interface changes
 =================

 ::

- --- mpv 0.37.0 ---
-    - `--save-position-on-quit` and its associated commands now store state files
-      in %LOCALAPPDATA% instead of %APPDATA% directory by default on Windows.
-    - change `--subs-with-matching-audio` default from `no` to `yes`
-    - change `--subs-fallback` default from `no` to `default`
-    - add the `--hdr-peak-percentile` option
-    - include `--hdr-peak-percentile` in the `gpu-hq` profile
-    - change `--audiotrack-pcm-float` default from `no` to `yes`
-    - add video-params/aspect-name
-    - change type of `--sub-pos` to float
-    - The remaining time printed in the terminal is now adjusted for speed by default.
-      You can disable this with `--no-term-remaining-playtime`.
-    - add `playlist-path` and `playlist/N/playlist-path` properties
-    - add `--x11-wid-title` option
-    - add `--libplacebo-opts` option
-    - add `--audio-file-exts`, `--cover-art-auto-exts`, and `--sub-auto-exts`
-    - change `slang` default back to NULL
-    - remove special handling of the `auto` value from `--alang/slang/vlang` options
-    - add `--subs-match-os-language` as a replacement for `--slang=auto`
-    - add `always` option to `--subs-fallback-forced`
-    - remove `auto` choice from `--sub-forced-only`
-    - remove `auto-forced-only` property
-    - rename `--sub-forced-only` to `--sub-forced-events-only`
-    - remove `sub-forced-only-cur` property (`--sub-forced-events-only` is a replacement)
-    - remove deprecated `video-aspect` property
-    - add `--video-crop`
-    - add `video-params/crop-[w,h,x,y]`
-    - remove `--tone-mapping-mode`
-    - change `--subs-fallback-forced` so that it works alongside `--slang`
-    - add `--icc-3dlut-size=auto` and make it the default
-    - add `--scale=ewa_lanczos4sharpest`
-    - remove `--scale-wblur`, `--cscale-wblur`, `--dscale-wblur`, `--tscale-wblur`
-    - remove `bcspline` filter (`bicubic` is now the same as `bcspline`)
-    - rename `--cache-dir` and `--cache-unlink-files` to `--demuxer-cache-dir` and
-      `--demuxer-cache-unlink-files`
-    - enable `--correct-downscaling`, `--linear-downscaling`, `--sigmoid-upscaling`
-    - `--cscale` defaults to `--scale` if not defined
-    - change `--tscale` default to `oversample`
-    - change `--dither-depth` to `auto`
-    - deprecate `--profile=gpu-hq`, add `--profile=<fast|high-quality>`
-    - change `--dscale` default to `hermite`
-    - update defaults to `--hdr-peak-decay-rate=20`, `--hdr-scene-threshold-low=1.0`,
-      `--hdr-scene-threshold-high=3.0`
-    - update defaults to `--deband-threshold=48`, `--deband-grain=32`
-    - add `--directory-mode=auto` and make it the default
-    - remove deprecated `--profile=opengl-hq`
-    - remove several legacy fallbacks for old deprecated options (now they will just
-      error out like normal)
-    - remove deprecated `drop-frame-count` and `vo-drop-frame-count` property aliases
-    - remove the ability to write to the `display-fps` property (use `override-display-fps`
-      instead)
-    - writing the current value to playlist-pos will no longer restart playback (use
-      `playlist-play-index` instead)
-    - remove deprecated `--oaoffset`, `--oafirst`, `--ovoffset`, `--ovfirst`,
-      `--demuxer-force-retry-on-eof`, `--fit-border` options
-    - remove deprecated `--record-file` option
-    - remove deprecated `--vf-defaults` and `--af-defaults` options
-    - `--drm-connector` no longer allows selecting the card number (use `--drm-device`
-      instead)
-    - add `--title-bar` option
-    - add `--window-corners` option
-    - rename `--cdrom-device` to `--cdda-device`
-    - remove `--scale-cutoff`, `--cscale-cutoff`, `--dscale-cutoff`, `--tscale-cutoff`
-    - remove `--scaler-lut-size`
-    - deprecate shared-script-properties (user-data is a replacement)
-    - add `--backdrop-type` option
-    - add `--window-affinity` option
-    - `--config-dir` no longer forces cache and state files to also reside in there
-    - deprecate `--demuxer-cue-codepage` in favor of `--metadata-codepage`
-    - change the default of `metadata-codepage` to `auto`
-    - add `playlist-next-playlist` and `playlist-prev-playlist` commands
-    - change `video-codec` to show description or name, not both
-    - deprecate `--cdda-toc-bias` option, offsets are always checked now
-    - disable `--allow-delayed-peak-detect` by default
-    - rename `--fps` to `--container-fps-override`
-    - rename `--override-display-fps` to `--display-fps-override`
-    - rename `--sub-ass-force-style` to `--sub-ass-style-overrides`
-    - alias `--screenshot-directory` to `--screenshot-dir`
-    - alias `--watch-later-directory` to `--watch-later-dir`
-    - rename `--play-dir` to `--play-direction`
-    - `--js-memory-report` is now used for enabling memory reporting for javascript
-      scripts
-    - drop support for `-del` syntax for list options
-    - `--demuxer-hysteresis-secs` now respects `--cache-secs` and/or
-      `--demuxer-readahead-secs` as well
-    - add hdr metadata to `video-params` property
-    - add `--target-gamut`
-    - change the way display names are retrieved on macOS, usage of options and properties
-      `--fs-screen-name`, `--screen-name` and `display-names` needs to be adjusted
-    - remove OpenGL cocoa backend that was deprecated in 0.29
-    - remove `border`, `fullscreen`, `ontop`, `osd-level` and `pause`
-      from default `--watch-later-options`
-    - add `video-*` and `secondary-sub-visibility` to default `--watch-later-options`
- --- mpv 0.36.0 ---
-    - add `--target-contrast`
-    - Target luminance value is now also applied when ICC profile is used.
-      `--icc-use-luma` has been added to use ICC profile luminance value.
-      If target luminance and ICC luminance is not used, old behavior apply,
-      defaulting to 203 nits. (Only applies for `--vo=gpu-next`)
-    - `playlist/N/title` gets set upon opening the file if it wasn't already set
-      and a title is available.
-    - add the `--vo=kitty` video output driver, as well as the options
-      `--vo-kitty-cols`, `--vo-kitty-rows`, `--vo-kitty-width`,
-      `--vo-kitty-height`, `--vo-kitty-left`, `--vo-kitty-top`,
-      `--vo-kitty-config-clear`, `--vo-kitty-alt-screen` and
-      `--vo-kitty-use-shm`
-    - add `--force-render`
-    - add `--vo-sixel-config-clear`, `--vo-sixel-alt-screen` and
-      `--vo-sixel-buffered`
-    - add `--wayland-content-type`
-    - deprecate `--vo-sixel-exit-clear` and alias it to
-      `--vo-sixel-alt-screen`
-    - deprecate `--drm-atomic`
-    - add `--demuxer-hysteresis-secs`
-    - add `--video-sync=display-tempo`
-    - the `start` option is no longer unconditionally written by
-      watch-later. It is still written by default but you may
-      need to explicitly add `start` depending on how you have
-      `--watch-later-options` configured.
-    - add `--vd-lavc-dr=auto` and make it the default
-    - add support for the fractional scale protocol in wayland
-    - in wayland, hidpi window scaling now scales the window by the compositor's
-      dpi scale factor by default (can be disabled with --no-hidpi-window-scale
-      if fractional scaling support exists).
-    - change --screenshot-tag-colorspace default value from `no` to `yes`
-    - undeprecate vf_sub
-    - add `--tone-mapping=st2094-40` and `--tone-mapping=st2094-10`
-    - change `--screenshot-jxl-effort` default from `3` to `4`.
-    - add `--tone-mapping-visualize`
-    - change type of `--brightness`, `--saturation`, `--contrast`, `--hue` and
-      `--gamma` to float.
-    - add `platform` property
-    - add `--auto-window-resize`
-    - `--save-position-on-quit` and its associated commands now store state files in
-      the XDG_STATE_HOME directory by default. This only has an effect on linux/bsd
-      systems.
-    - mpv now implictly saves cache files in XDG_CACHE_HOME by default. This only has
-      an effect if the user enables options that would lead to cache being stored and
-      only makes a difference on linux/bsd systems.
-    - `--cache-on-disk` no longer requires explictly setting the `--cache-dir` option
-    - add `--icc-cache` and `--gpu-shader-cache` options to control whether or not to
-      save cache files for these features; explictly setting `--icc-cache-dir` and
-      `--gpu-shader-cache` is no longer required
-    - remove the `--tone-mapping-crosstalk` option
-    - add `--gamut-mapping-mode=perceptual|relative|saturation|absolute|linear`
-    - add `--corner-rounding` option
-    - change `--subs-with-matching-audio` default from `yes` to `no`
-    - change `--slang` default from blank to `auto`
-    - add `--input-cursor-passthrough` option to allow pointer events to completely
-      passthrough the mpv window
-    - icc and gpu-shader cache are now saved by default (use --no-icc-shader-cache and
-      --no-gpu-shader-cache to disable)
-    - add `--directory-mode=recursive|lazy|ignore`
-    - `--hwdec=yes` is now mapped to `auto-safe` rather than `auto` (also used
-      by ctrl+h keybind)
-    - add `--hdr-contrast-recovery` and `--hdr-contrast-smoothness`
-    - include `--hdr-contrast-recovery` in the `gpu-hq` profile
- --- mpv 0.35.0 ---
-    - add the `--vo=gpu-next` video output driver, as well as the options
-      `--allow-delayed-peak-detect`, `--builtin-scalers`,
-      `--interpolation-preserve` `--lut`, `--lut-type`, `--image-lut`,
-      `--image-lut-type` and `--target-lut` along with it.
-    - add `--target-colorspace-hint`
-    - add `--tone-mapping-crosstalk`
-    - add `--tone-mapping` options `auto`, `spline` and `bt.2446a`
-    - add `--inverse-tone-mapping`
-    - add `--gamut-mapping-mode`, replacing `--gamut-clipping` and `--gamut-warning`
-    - add `--tone-mapping-mode`, replacing `--tone-mapping-desaturate` and
-      `--tone-mapping-desaturate-exponent`.
-    - add `dolbyvision` sub-parameter to `format` video filter
-    - `--sub-visibility` no longer has any effect on secondary subtitles
-    - add `film-grain` sub-parameter to `format` video filter
-    - add experimental `--vo=dmabuf-wayland` video output driver
-    - add `--x11-present` for controlling whether to use xorg's present extension
-    - add `engine` option to the `rubberband` audio filter to support the new
-      engine introduced in rubberband 3.0.0. Defaults to `finer` (new engine).
-    - add `--wayland-configure-bounds` option
-    - deprecate `--gamma-factor`
-    - deprecate `--gamma-auto`
-    - remove `--vulkan-disable-events`
-    - add `--glsl-shader-opts`
- --- mpv 0.34.0 ---
-    - deprecate selecting by card number with `--drm-connector`, add
-      `--drm-device` which can be used instead
-    - add `--screen-name` and `--fs-screen-name` flags to allow selecting the
-      screen by its name instead of the index
-    - add `--macos-geometry-calculation` to change the rectangle used for screen
-      position and size calculation. the old behavior used the whole screen,
-      which didn't take the menu bar and Dock into account. The new default
-      behaviour includes both. To revert to the old behavior set this to
-      `whole`.
-    - add an additional optional `albumart` argument to the `video-add` command,
-      which tells mpv to load the given video as album art.
-    - undeprecate `--cache-secs` option
-    - remove `--icc-contrast` and introduce `--icc-force-contrast`. The latter
-      defaults to the equivalent of the old `--icc-contrast=inf`, and can
-      instead be used to specifically set the contrast to any value.
-    - add a `--watch-later-options` option to allow configuring which
-      options quit-watch-later saves
-    - make `current-window-scale` writeable and use it in the default input.conf
-    - add `--input-builtin-bindings` flag to control loading of built-in key
-      bindings during start-up (default: yes).
-    - add ``track-list/N/image`` sub-property
-    - remove `--opengl-restrict` option
-    - js custom-init: use filename ~~/init.js instead of ~~/.init.js (dot)
- --- mpv 0.33.0 ---
-    - add `--d3d11-exclusive-fs` flag to enable D3D11 exclusive fullscreen mode
-      when the player enters fullscreen.
-    - directories in ~/.mpv/scripts/ (or equivalent) now have special semantics
-      (see mpv Lua scripting docs)
-    - names starting with "." in ~/.mpv/scripts/ (or equivalent) are now ignored
-    - js modules: ~~/scripts/modules.js/ is no longer used, global paths can be
-      set with custom init (see docs), dir-scripts first look at <dir>/modules/
-    - the OSX bundle now logs to "~/Library/Logs/mpv.log" by default
-    - deprecate the --cache-secs option (once removed, the cache cannot be
-      limited by time anymore)
-    - remove deprecated legacy hook API ("hook-add", "hook-ack"). Use either the
-      libmpv API (mpv_hook_add(), mpv_hook_continue()), or the Lua scripting
-      wrappers (mp.add_hook()).
-    - improve how property change notifications are delivered on events and on
-      hooks. In particular, a hook event is only returned to a client after all
-      changes initiated before the hook point were delivered to the same client.
-      In addition, it should no longer happen that events and property change
-      notifications were interleaved in bad ways (it could happen that a
-      property notification delivered after an event contained a value that was
-      valid only before the event happened).
-    - the playlist-pos and playlist-pos-1 properties now can return and accept
-      -1, and are never unavailable. Out of range indexes are now accepted, but
-      behave like writing -1.
-    - the playlist-pos and playlist-pos-1 properties deprecate the current
-      behavior when writing back the current value to the property: currently,
-      this restarts playback, but in the future, it will do nothing.
-      Using the "playlist-play-index" command is recommended instead.
-    - add "playlist-play-index" command
-    - add playlist-current-pos, playlist-playing-pos properties
-    - Lua end-file events set the "error" field; this is deprecated; use the
-      "file_error" instead for this specific event. Scripts relying on the
-      "error" field for end-file will silently break at some point in the
-      future.
-    - remove deprecated --input-file option, add --input-ipc-client, which is
-      vaguely a replacement of the removed option, but not the same
-    - change another detail for track selection options (see --aid manpage
-      entry)
-    - reading loop-file property as native property or mpv_node will now return
-      "inf" instead of boolean true (also affects loop option)
-    - remove some --vo-direct3d-... options (it got dumbed down; use --vo=gpu)
-    - remove video-params/plane-depth property (was too vaguely defined)
-    - remove --video-sync-adrop-size option (implementation was changed, no
-      replacement for what this option did)
-    - undeprecate --video-sync=display-adrop
-    - deprecate legacy auto profiles (profiles starting with "extension." and
-      "protocol."). Use conditional auto profiles instead.
-    - the "subprocess" command does not connect spawned processes' stdin to
-      mpv's stdin anymore. Instead, stdin is connected to /dev/null by default.
-      To get the old behavior, set the "passthrough_stdin" argument to true.
-    - key/value list options do not accept ":" as item separator anymore,
-      only ",". This means ":" is always considered part of the value.
-    - remove deprecated --vo-vdpau-deint option
-    - add `delete-watch-later-config` command to complement
-      `write-watch-later-config`
- --- mpv 0.32.0 ---
-    - change behavior when using legacy option syntax with options that start
-      with two dashes (``--`` instead of a ``-``). Now, using the recommended
-      syntax is required for options starting with ``--``, which means an option
-      value must be strictly passed after a ``=``, instead of as separate
-      argument. For example, ``--log-file f.txt`` was previously accepted and
-      behaved like ``--log-file=f.txt``, but now causes an error. Use of legacy
-      syntax that is still supported now prints a deprecation warning.
- --- mpv 0.31.0 ---
-    - add `--resume-playback-check-mtime` to check consistent mtime when
-      restoring playback state.
-    - add `--d3d11-output-csp` to enable explicit selection of a D3D11
-      swap chain color space.
-    - the --sws- options and similar now affect vo_image and screenshot
-      conversion (does not matter as much for vo_gpu, which does most of this
-      with shaders)
-    - add a builtin "sw-fast" profile, which restores performance settings
-      for software video conversion. These were switched to higher quality since
-      mpv 0.30.0 (related to the previous changelog entry). This affects video
-      outputs like vo_x11 and vo_drm, and screenshots, but not much else.
-    - deprecate --input-file (there are no plans to remove this short-term,
-      but it will probably eventually go away <- that was a lie)
-    - deprecate --video-sync=display-adrop (might be removed if it's in the way;
-      undeprecated or readded if it's not too much of a problem)
-    - deprecate all input section commands (these will be changed/removed, as
-      soon as mpv internals do not require them anymore)
-    - remove deprecated --playlist-pos alias (use --playlist-start)
-    - deprecate --display-fps, introduce --override-display-fps. The display-fps
-      property now is unavailable if no VO exists (or the VO did not return a
-      display FPS), instead of returning the option value in this case. The
-      property will keep existing, but writing to it is deprecated.
-    - the vf/af properties now do not reject the set value anymore, even if
-      filter chain initialization fails. Instead, the vf/af options are always
-      set to the user's value, even if it does not reflect the "runtime" vf/af
-      chain.
-    - the vid/aid/sid/secondary-sid properties (and their aliases: "audio",
-      "video", "sub") will now allow setting any track ID; before this change,
-      only IDs of actually existing tracks could be set (the restriction was
-      active the MPV_EVENT_FILE_LOADED/"file-loaded" event was sent). Setting
-      an ID for which no track exists is equivalent to disabling it. Note that
-      setting the properties to non-existing tracks may report it as selected
-      track for a small time window, until it's forced back to "no". The exact
-      details how this is handled may change in the future.
-    - remove old Apple Remote support, including --input-appleremote
-    - add MediaPlayer support and remove the old Media Key event tap on macOS.
-      this possibly also re-adds the Apple Remote support
-    - the "edition" property now strictly returns the value of the option,
-      instead of the runtime value. The new "current-edition" property needs to
-      be queried to read the runtime-chosen edition. This is a breaking change
-      for any users which expected "edition" to return the runtime-chosen
-      edition at default settings (--edition=auto).
-    - the "window-scale" property now strictly returns the value of the option,
-      instead of the actual size of the window. The new "current-window-scale"
-      property needs to be queried to read the value as indicated by the current
-      window size. This is a breaking change.
-    - explicitly deprecate passing more than 1 item to "-add" suffix in key/value
-      options (for example --script-opts-add). This was actually always
-      deprecated, like with other list options, but the option parser did not
-      print a warning in this particular case.
-    - deprecate -del for list options (use -remove instead, which is by content
-      instead of by integer index)
-    - if `--fs` is used but `--fs-screen` is not set, mpv will now use `--screen`
-      instead.
-    - change the default of --hwdec to "no" on RPI. The default used to be "mmal"
-      specifically if 'Raspberry Pi support' was enabled at configure time
-      (equivalent to --enable-rpi). Use --hwdec=mmal to get the old behavior.
- --- mpv 0.30.0 ---
-    - add `--d3d11-output-format` to enable explicit selection of a D3D11
-      swap chain format.
-    - rewrite DVB channel switching to use an integer value
-      `--dvbin-channel-switch-offset` for switching instead of the old
-      stream controls which are now gone. Cycling this property up or down will
-      change the offset to the channel which was initially tuned to.
-      Example for `input.conf`: `H cycle dvbin-channel-switch-offset up`,
-      `K cycle dvbin-channel-switch-offset down`.
-    - adapt `stream_dvb` to support writing to `dvbin-prog` at runtime
-      and also to consistently use dvbin-configuration over URI parameters
-      when provided
-    - add `--d3d11-adapter` to enable explicit selection of a D3D11 rendering
-      adapter by name.
-    - rename `--drm-osd-plane-id` to `--drm-draw-plane`, `--drm-video-plane-id` to
-      `--drm-drmprime-video-plane` and `--drm-osd-size` to `--drm-draw-surface-size`
-      to better reflect what the options actually control, that the values they
-      accept aren't actually internal DRM ID's (like with similar options in
-      ffmpeg's KMS support), and that the video plane is only used when the drmprime
-      overlay hwdec interop is active, with the video being drawn to the draw plane
-      otherwise.
-    - in addition to the above, the `--drm-draw-plane` and `--drm-drmprime-video-plane`
-      options now accept either an integer index, or the values primary or overlay.
-      `--drm-draw-plane` now defaults to primary and `--drm-drmprime-video-plane`
-      defaults to overlay. This should be similar to previous behavior on most drivers
-      due to how planes are usually sorted.
-    - rename --opensles-frames-per-buffer to --opensles-frames-per-enqueue to
-      better reflect its purpose. In the past it overrides the buffer size the AO
-      requests (but not the default/value of the generic --audio-buffer option).
-      Now it only guarantees that the soft buffer size will not be smaller than
-      itself while setting the size per Enqueue.
-    - add --opensles-buffer-size-in-ms, allowing user to tune the soft buffer size.
-      It overrides the --audio-buffer option unless it's set to 0 (with the default
-      being 250).
-    - remove `--linear-scaling`, replaced by `--linear-upscaling` and
-      `--linear-downscaling`. This means that `--sigmoid-upscaling` no longer
-      implies linear light downscaling as well, which was confusing.
-    - the built-in `gpu-hq` profile now includes` --linear-downscaling`.
-    - support for `--spirv-compiler=nvidia` has been removed, leaving `shaderc`
-      as the only option. The `--spirv-compiler` option itself has been marked
-      as deprecated, and may be removed in the future.
-    - split up `--tone-mapping-desaturate`` into strength + exponent, instead of
-      only using a single value (which previously just controlled the exponent).
-      The strength now linearly blends between the linear and nonlinear tone
-      mapped versions of a color.
-    - add --hdr-peak-decay-rate and --hdr-scene-threshold-low/high
-    - add --tone-mapping-max-boost
-    - ipc: require that "request_id" fields are integers. Other types are still
-      accepted for compatibility, but this will stop in the future. Also, if no
-      request_id is provided, 0 will be assumed.
-    - mpv_command_node() and mp.command_native() now support named arguments
-      (see manpage). If you want to use them, use a new version of the manpage
-      as reference, which lists the definitive names.
-    - edition and disc title switching will now fully reload playback (may have
-      consequences for scripts, client API, or when using file-local options)
-    - with the removal of the stream cache, the following properties and options were
-      dropped: `cache`, `cache-size`, `cache-free`, `cache-used`, `--cache-default`,
-      `--cache-initial`, `--cache-seek-min`, `--cache-backbuffer`, `--cache-file`,
-      `--cache-file-size`
-    - the --cache option does not take a number value anymore
-    - remove async playback abort hack. This may make it impossible to abort
-      playback if --demuxer-thread=no is forced.
-    - remove `--macos-title-bar-style`, replaced by `--macos-title-bar-material`
-      and `--macos-title-bar-appearance`.
-    - The default for `--vulkan-async-compute` has changed to `yes` from `no`
-      with the move to libplacebo as the back-end for vulkan rendering.
-    - Remove "disc-titles", "disc-title", "disc-title-list", and "angle"
-      properties. dvd:// does not support title ranges anymore.
-    - Remove all "tv-..." options and properties, along with the classic Linux
-      analog TV support.
-    - remove "program" property (no replacement)
-    - always prefer EGL over GLX, which helps with AMD/vaapi, but will break
-      vdpau with --vo=gpu - use --gpu-context=x11 to be able to use vdpau. This
-      does not affect --vo=vdpau or --hwdec=vdpau-copy.
-    - remove deprecated --chapter option
-    - deprecate --record-file
-    - add `--demuxer-cue-codepage`
-    - add ``track-list/N/demux-bitrate``, ``track-list/N/demux-rotation`` and
-      ``track-list/N/demux-par`` property
-    - Deprecate ``--video-aspect`` and add ``--video-aspect-override`` to
-      replace it. (The `video-aspect` option remains unchanged.)
+ --- mpv 0.29.1 ---
+    - add --cocoa-cb-sw-renderer to control the usage of Apple Software Renderer
 --- mpv 0.29.0 ---
    - drop --opensles-sample-rate, as --audio-samplerate should be used if desired
    - drop deprecated --videotoolbox-format, --ff-aid, --ff-vid, --ff-sid,
@@ -517,11 +105,10 @@ Interface changes
      of 3D content doesn't justify such an option anyway.
    - change cycle-values command to use the current value, instead of an
      internal counter that remembered the current position.
+    - edition and disc title switching will now fully reload playback (may have
+      consequences for scripts, client API, or when using file-local options)
    - remove deprecated ao/vo auto profiles. Consider using scripts like
      auto-profiles.lua instead.
-    - --[c]scale-[w]param[1|2] and --tone-mapping-param now accept "default",
-      and if set to that value, reading them as property will also return
-      "default", instead of float nan as in previous versions
 --- mpv 0.28.0 ---
    - rename --hwdec=mediacodec option to mediacodec-copy, to reflect
      conventions followed by other hardware video decoding APIs
@@ -19,11 +19,49 @@ syntax is:
    The ``--vf`` description describes how libavfilter can be used and how to
    workaround deprecated mpv filters.

-See ``--vf`` group of options for info on how ``--af-add``, ``--af-pre``,
-``--af-clr``, and possibly others work.
+See ``--vf`` group of options for info on how ``--af-defaults``, ``--af-add``,
+``--af-pre``, ``--af-del``, ``--af-clr``, and possibly others work.

 Available filters are:

+``lavrresample[=option1:option2:...]``
+    This filter uses libavresample (or libswresample, depending on the build)
+    to change sample rate, sample format, or channel layout of the audio stream.
+    This filter is automatically enabled if the audio output does not support
+    the audio configuration of the file being played.
+
+    .. warning::
+
+        Deprecated. Either use the ``--audio-resample-...`` options to customize
+        resampling, or the libavfilter ``--af=aresample`` filter, which has its
+        own options.
+
+    It supports only the following sample formats: u8, s16, s32, float.
+
+    ``filter-size=<length>``
+        Length of the filter with respect to the lower sampling rate. (default:
+        16)
+    ``phase-shift=<count>``
+        Log2 of the number of polyphase entries. (..., 10->1024, 11->2048,
+        12->4096, ...) (default: 10->1024)
+    ``cutoff=<cutoff>``
+        Cutoff frequency (0.0-1.0), default set depending upon filter length.
+    ``linear``
+        If set then filters will be linearly interpolated between polyphase
+        entries. (default: no)
+    ``no-detach``
+        Do not detach if input and output audio format/rate/channels match.
+        (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 the ``--audio-resample-...`` options.) This
+        does not do anything anymore and the filter will never detach.
+    ``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]``
    Encode multi-channel audio to AC-3 at runtime using libavcodec. Supports
    16-bit native-endian input format, maximum 6 channels. The output is
@@ -100,7 +138,7 @@ Available filters are:

 ``scaletempo[=option1:option2:...]``
    Scales audio tempo without altering pitch, optionally synced to playback
-    speed.
+    speed (default).

    This works by playing 'stride' ms of audio at normal speed then consuming
    'stride*scale' ms of input audio. It pieces the strides together by
@@ -116,8 +154,8 @@ Available filters are:
        cause noticeable skips at high scale amounts and an echo at low scale
        amounts. Very low values will alter pitch. Increasing improves
        performance. (default: 60)
-    ``overlap=<factor>``
-        Factor of stride to overlap. Decreasing improves performance.
+    ``overlap=<percent>``
+        Percentage of stride to overlap. Decreasing improves performance.
        (default: .20)
    ``search=<amount>``
        Length in milliseconds to search for best overlap position. Decreasing
@@ -162,59 +200,21 @@ Available filters are:
            Changing playback speed would change pitch, leaving audio tempo at
            1.2x.

-``scaletempo2[=option1:option2:...]``
-    Scales audio tempo without altering pitch.
-    The algorithm is ported from chromium and uses the
-    Waveform Similarity Overlap-and-add (WSOLA) method.
-    It seems to achieves higher audio quality than scaletempo, and rubberband R2
-    engine, or ``engine=faster``. This filter is inserted automatically if
-    ``audio-pitch-correction`` option is used (on by default) when the playback
-    speed is changed.
-
-    By default, the ``search-interval`` and ``window-size`` parameters
-    have the same values as in chromium.
-
-    ``min-speed=<speed>``
-        Mute audio if the playback speed is below ``<speed>``. (default: 0.25)
-
-    ``max-speed=<speed>``
-        Mute audio if the playback speed is above ``<speed>``
-        and ``<speed> != 0``. (default: 8.0)
-
-    ``search-interval=<amount>``
-        Length in milliseconds to search for best overlap position. (default: 40)
-
-    ``window-size=<amount>``
-        Length in milliseconds of the overlap-and-add window. (default: 12)
-
 ``rubberband``
    High quality pitch correction with librubberband. This can be used in place
-    of ``scaletempo`` and ``scaletempo2``, 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.
+    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=<amount>``
+    ``<pitch-scale>``
        Sets the pitch scaling factor. Frequencies are multiplied by this value.
-        (default: 1.0)
-
-    ``engine=<faster|finer>``
-        Select the core Rubberband engine to be used. There are two available:
-
-        :Faster: This is the Rubberband R2 engine. It uses significantly less
-                 CPU than the Finer (R3) engine.
-        :Finer: This is the Rubberband R3 engine. This engine is only available
-                with librubberband version 3 or newer. This produces significantly
-                higher quality output, at the cost of higher CPU usage. (Default
-                if available)

    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:
-    https://breakfastquay.com/rubberband/code-doc/classRubberBand_1_1RubberBandStretcher.html
-    Do note that certain options are only applicable to one of R2 (faster) and
-    R3 (finer) engines.
+    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``.)

@@ -258,10 +258,3 @@ Available filters are:
        broken filters. In practice, these broken filters will either cause slow
        A/V desync over time (with some files), or break playback completely if
        you seek or start playback from the middle of a file.
-
-``drop``
-    This filter drops or repeats audio frames to adapt to playback speed. It
-    always operates on full audio frames, because it was made to handle SPDIF
-    (compressed audio passthrough). This is used automatically if the
-    ``--video-sync=display-adrop`` option is used. Do not use this filter (or
-    the given option); they are extremely low quality.
@@ -14,7 +14,8 @@ in the list.

    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`` is preferred.
+    where PulseAudio is used. On BSD systems, ``--ao=oss`` or ``--ao=sndio``
+    may work (the latter being experimental).

 Available audio output drivers are:

@@ -30,8 +31,7 @@ Available audio output drivers are:
        explicitly reject multichannel output, as there is no way to detect
        whether a certain channel layout is actually supported.

-        You can also try `using the upmix plugin
-        <https://github.com/mpv-player/mpv/wiki/ALSA-Surround-Sound-and-Upmixing>`_.
+        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.
@@ -39,6 +39,15 @@ Available audio output drivers are:
 ``oss``
    OSS audio output driver

+    The following global options are supported by this audio output:
+
+    ``--oss-mixer-device``
+        Sets the audio mixer device (default: ``/dev/mixer``).
+    ``--oss-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.

@@ -69,8 +78,8 @@ Available audio output drivers are:
        mode is probably not very useful, other than for debugging or when used
        with fixed setups.

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

    Automatically redirects to ``coreaudio_exclusive`` when playing compressed
@@ -96,12 +105,12 @@ Available audio output drivers are:
        extreme care.


-``coreaudio_exclusive`` (macOS only)
-    Native macOS audio output driver using direct device access and
+``coreaudio_exclusive`` (Mac OS X only)
+    Native Mac OS X audio output driver using direct device access and
    exclusive mode (bypasses the sound server).

 ``openal``
-    OpenAL audio output driver.
+    OpenAL audio output driver

    ``--openal-num-buffers=<2-128>``
        Specify the number of audio buffers to use. Lower values are better for
@@ -113,7 +122,9 @@ Available audio output drivers are:

    ``--openal-direct-channels=<yes|no>``
        Enable OpenAL Soft's direct channel extension when available to avoid
-        tinting the sound with ambisonics or HRTF. Default: yes.
+        tinting the sound with ambisonics or HRTF.
+        Channels are dropped when when they are not available as downmixing
+        will be disabled. Default: no.

 ``pulse``
    PulseAudio audio output driver
@@ -128,7 +139,7 @@ Available audio output drivers are:
        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. "native" lets the sound server determine buffers.
+        changes.

    ``--pulse-latency-hacks=<yes|no>``
        Enable hacks to workaround PulseAudio timing bugs (default: no). If
@@ -141,31 +152,6 @@ Available audio output drivers are:
        If you have stuttering video when using pulse, try to enable this
        option. (Or try to update PulseAudio.)

-    ``--pulse-allow-suspended=<yes|no>``
-        Allow mpv to use PulseAudio even if the sink is suspended (default: no).
-        Can be useful if PulseAudio is running as a bridge to jack and mpv has its sink-input set to the one jack is using.
-
-``pipewire``
-    PipeWire audio output driver
-
-    The following global options are supported by this audio output:
-
-    ``--pipewire-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. "native" lets the sound server determine buffers.
-
-    ``--pipewire-remote=<remote>``
-        Specify the PipeWire remote daemon name to connect to via local UNIX
-        sockets.
-        An empty <remote> string uses the default remote named ``pipewire-0``.
-
-    ``--pipewire-volume-mode=<channel|global>``
-        Specify if the ``ao-volume`` property should apply to the channel
-        volumes or the global volume.
-        By default the channel volumes are used.
-
 ``sdl``
    SDL 1.2+ audio output driver. Should work on any platform supported by SDL
    1.2, but may require the ``SDL_AUDIODRIVER`` environment variable to be set
@@ -183,6 +169,10 @@ Available audio output drivers are:
        obtained exact buffer size. A value of 0 selects the sound system
        default.

+    ``--sdl-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.
@@ -239,9 +229,19 @@ Available audio output drivers are:
        ``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 ``< >``).
+
+    .. note:: Completely useless, unless you intend to run RSound. Not to be
+              confused with RoarAudio, which is something completely
+              different.
+
 ``sndio``
    Audio output to the OpenBSD sndio sound system

+    .. note:: Experimental. There are known bugs and issues.
+
    (Note: only supports mono, stereo, 4.0, 5.1 and 7.1 channel
    layouts.)

@@ -8,12 +8,10 @@ There is no real changelog, but you can look at the following things:

  https://github.com/mpv-player/mpv/releases
 * The git log, which is the "real" changelog
-* The file https://github.com/mpv-player/mpv/blob/master/DOCS/interface-changes.rst
-  documents changes to the command and user interface, such as options and
-  properties. (It usually documents breaking changes only, additions and
-  enhancements are often not listed.)
-* C API changes are listed in
-  https://github.com/mpv-player/mpv/blob/master/DOCS/client-api-changes.rst
+* 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
@@ -1,167 +0,0 @@
-CONSOLE
-=======
-
-The console is a REPL for mpv input commands. It is displayed on the video
-window. It also shows log messages. It can be disabled entirely using the
-``--load-osd-console=no`` option.
-
-Keybindings
-----------
-
-\`
-    Show the console.
-
-ESC and Ctrl+[
-    Hide the console.
-
-ENTER, Ctrl+j and Ctrl+m
-    Run the typed command.
-
-Shift+ENTER
-    Type a literal newline character.
-
-LEFT and Ctrl+b
-    Move the cursor to the previous character.
-
-RIGHT and Ctrl+f
-    Move the cursor to the next character.
-
-Ctrl+LEFT and Alt+b
-    Move the cursor to the beginning of the current word, or if between words,
-    to the beginning of the previous word.
-
-Ctrl+RIGHT and Alt+f
-    Move the cursor to the end of the current word, or if between words, to the
-    end of the next word.
-
-HOME and Ctrl+a
-    Move the cursor to the start of the current line.
-
-END and Ctrl+e
-    Move the cursor to the end of the current line.
-
-BACKSPACE and Ctrl+h
-    Delete the previous character.
-
-Ctrl+d
-    Hide the console if the current line is empty, otherwise delete the next
-    character.
-
-Ctrl+BACKSPACE and Ctrl+w
-    Delete text from the cursor to the beginning of the current word, or if
-    between words, to the beginning of the previous word.
-
-Ctrl+DEL and Alt+d
-    Delete text from the cursor to the end of the current word, or if between
-    words, to the end of the next word.
-
-Ctrl+u
-    Delete text from the cursor to the beginning of the current line.
-
-Ctrl+k
-    Delete text from the cursor to the end of the current line.
-
-Ctrl+c
-    Clear the current line.
-
-UP and Ctrl+p
-    Move back in the command history.
-
-DOWN and Ctrl+n
-    Move forward in the command history.
-
-PGUP
-    Go to the first command in the history.
-
-PGDN
-    Stop navigating the command history.
-
-INSERT
-    Toggle insert mode.
-
-Ctrl+v
-    Paste text (uses the clipboard on X11 and Wayland).
-
-Shift+INSERT
-    Paste text (uses the primary selection on X11 and Wayland).
-
-TAB and Ctrl+i
-    Complete the command or property name at the cursor.
-
-Ctrl+l
-    Clear all log messages from the console.
-
-Commands
--------
-
-``script-message-to console type <text> [<cursor_pos>]``
-    Show the console and pre-fill it with the provided text, optionally
-    specifying the initial cursor position as a positive integer starting from
-    1.
-
-    .. admonition:: Examples for input.conf
-
-        ``% script-message-to console type "seek  absolute-percent; keypress ESC" 6``
-            Enter a percent position to seek to and close the console.
-
-        ``Ctrl+o script-message-to console type "loadfile ''; keypress ESC" 11``
-            Enter a file or URL to play. Tab completes paths in the filesystem.
-
-Known issues
------------
-
- Pasting text is slow on Windows
- Non-ASCII keyboard input has restrictions
- The cursor keys move between Unicode code-points, not grapheme clusters
-
-Configuration
-------------
-
-This script can be customized through a config file ``script-opts/console.conf``
-placed in mpv's user directory and through the ``--script-opts`` command-line
-option. The configuration syntax is described in `ON SCREEN CONTROLLER`_.
-
-Key bindings can be changed in a standard way, see for example stats.lua
-documentation.
-
-Configurable Options
-~~~~~~~~~~~~~~~~~~~~
-
-``scale``
-    Default: 1
-
-    All drawing is scaled by this value, including the text borders and the
-    cursor.
-
-    If the VO backend in use has HiDPI scale reporting implemented, the option
-    value is scaled with the reported HiDPI scale.
-
-``font``
-    Default: unset (picks a hardcoded font depending on detected platform)
-
-    Set the font used for the REPL and the console.
-    This has to be a monospaced font for the completion suggestions to be
-    aligned correctly.
-
-``font_size``
-    Default: 16
-
-    Set the font size used for the REPL and the console. This will be
-    multiplied by "scale".
-
-``border_size``
-    Default: 1
-
-    Set the font border size used for the REPL and the console.
-
-``history_dedup``
-    Default: true
-
-    Remove duplicate entries in history as to only keep the latest one.
-    multiplied by "scale."
-
-``font_hw_ratio``
-    Default: 2.0
-
-    The ratio of font height to font width.
-    Adjusts table width of completion suggestions.
@@ -15,11 +15,11 @@ You can encode files from one format/codec to another using this facility.
    Specifies the output format options for libavformat.
    See ``--ofopts=help`` for a full list of supported options.

-    This is a key/value list option. See `List Options`_ for details.
+    Options are managed in lists. There are a few commands to manage the
+    options list.

-    ``--ofopts-add=<option>``
-        Appends the option given as an argument to the options list. (Passing
-        multiple options is currently still possible, but deprecated.)
+    ``--ofopts-add=<options1[,options2,...]>``
+        Appends the options given as arguments to the options list.

    ``--ofopts=""``
        Completely empties the options list.
@@ -28,6 +28,10 @@ You can encode files from one format/codec to another using this facility.
    Specifies the output audio codec. See ``--oac=help`` for a full list of
    supported codecs.

+``--oaoffset=<value>``
+    Shifts audio data by the given time (in seconds) by adding/removing
+    samples at the start. Deprecated.
+
 ``--oacopts=<options>``
    Specifies the output audio codec options for libavcodec.
    See ``--oacopts=help`` for a full list of supported options.
@@ -37,19 +41,27 @@ You can encode files from one format/codec to another using this facility.
        "``--oac=libmp3lame --oacopts=b=128000``"
            selects 128 kbps MP3 encoding.

-    This is a key/value list option. See `List Options`_ for details.
+    Options are managed in lists. There are a few commands to manage the
+    options list.

-    ``--oacopts-add=<option>``
-        Appends the option given as an argument to the options list. (Passing
-        multiple options is currently still possible, but deprecated.)
+    ``--oacopts-add=<options1[,options2,...]>``
+        Appends the options given as arguments to the options list.

    ``--oacopts=""``
        Completely empties the options list.

+``--oafirst``
+    Force the audio stream to become the first stream in the output.
+    By default, the order is unspecified. Deprecated.
+
 ``--ovc=<codec>``
    Specifies the output video codec. See ``--ovc=help`` for a full list of
    supported codecs.

+``--ovoffset=<value>``
+    Shifts video data by the given time (in seconds) by shifting the pts
+    values. Deprecated.
+
 ``--ovcopts=<options>``
    Specifies the output video codec options for libavcodec.
    See --ovcopts=help for a full list of supported options.
@@ -62,15 +74,19 @@ You can encode files from one format/codec to another using this facility.
        ``"--ovc=libx264 --ovcopts=crf=23"``
            selects VBR quality factor 23 for H.264 encoding.

-    This is a key/value list option. See `List Options`_ for details.
+    Options are managed in lists. There are a few commands to manage the
+    options list.

-    ``--ovcopts-add=<option>``
-        Appends the option given as an argument to the options list. (Passing
-        multiple options is currently still possible, but deprecated.)
+    ``--ovcopts-add=<options1[,options2,...]>``
+        Appends the options given as arguments to the options list.

    ``--ovcopts=""``
        Completely empties the options list.

+``--ovfirst``
+    Force the video stream to become the first stream in the output.
+    By default, the order is unspecified. Deprecated.
+
 ``--orawts``
    Copies input pts to the output video (not supported by some output
    container formats, e.g. AVI). In this mode, discontinuities are not fixed
@@ -87,8 +103,6 @@ You can encode files from one format/codec to another using this facility.
    FLAC allow almost arbitrary keys, while support in MP4 and MP3 is more
    limited.

-    This is a key/value list option. See `List Options`_ for details.
-
    .. admonition:: Example

        "``--oset-metadata=title="Output title",comment="Another tag"``"
@@ -98,8 +112,6 @@ You can encode files from one format/codec to another using this facility.
    Specifies metadata to exclude from the output file when copying from the
    input file.

-    This is a string list option. See `List Options`_ for details.
-
    .. admonition:: Example

        "``--oremove-metadata=comment,genre``"
@@ -71,18 +71,9 @@ 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.)

-You can open the pipe in PuTTY as "serial" device. This is not very
-comfortable, but gives a way to test interactively without having to write code.
-
 Protocol
 --------

-The protocol uses UTF-8-only JSON as defined by RFC-8259. Unlike standard JSON,
-"\u" escape sequences are not allowed to construct surrogate pairs. To avoid
-getting conflicts, encode all text characters including and above codepoint
-U+0020 as UTF-8. mpv might output broken UTF-8 in corner cases (see "UTF-8"
-section below).
-
 Clients can execute commands on the player by sending JSON messages of the
 following form:

@@ -116,11 +107,8 @@ 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 interpret the ``request_id`` in any
-way; it is solely for the use of the requester. The only requirement is that
-the ``request_id`` field must be an integer (a number without fractional parts
-in the range ``-2^63..2^63-1``). Using other types is deprecated and will
-currently show a warning. In the future, this will raise an error.
+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:

@@ -134,8 +122,6 @@ Would generate this response:

    { "error": "success", "data": 1.468135, "request_id": 100 }

-If you don't specify a ``request_id``, command replies will set it to 0.
-
 All commands, replies, and events are separated from each other with a line
 break character (``\n``).

@@ -147,72 +133,6 @@ with ``#`` and empty lines are ignored.
 Currently, embedded 0 bytes terminate the current line, but you should not
 rely on this.

-Data flow
---------
-
-Currently, the mpv-side IPC implementation does not service the socket while a
-command is executed and the reply is written. It is for example not possible
-that other events, that happened during the execution of the command, are
-written to the socket before the reply is written.
-
-This might change in the future. The only guarantee is that replies to IPC
-messages are sent in sequence.
-
-Also, since socket I/O is inherently asynchronous, it is possible that you read
-unrelated event messages from the socket, before you read the reply to the
-previous command you sent. In this case, these events were queued by the mpv
-side before it read and started processing your command message.
-
-If the mpv-side IPC implementation switches away from blocking writes and
-blocking command execution, it may attempt to send events at any time.
-
-You can also use asynchronous commands, which can return in any order, and
-which do not block IPC protocol interaction at all while the command is
-executed in the background.
-
-Asynchronous commands
---------------------
-
-Command can be run asynchronously. This behaves exactly as with normal command
-execution, except that execution is not blocking. Other commands can be sent
-while it's executing, and command completion can be arbitrarily reordered.
-
-The ``async`` field controls this. If present, it must be a boolean. If missing,
-``false`` is assumed.
-
-For example, this initiates an asynchronous command:
-
-::
-
-    { "command": ["screenshot"], "request_id": 123, "async": true }
-
-And this is the completion:
-
-::
-
-    {"request_id":123,"error":"success","data":null}
-
-By design, you will not get a confirmation that the command was started. If a
-command is long running, sending the message will not lead to any reply until
-much later when the command finishes.
-
-Some commands execute synchronously, but these will behave like asynchronous
-commands that finished execution immediately.
-
-Cancellation of asynchronous commands is available in the libmpv API, but has
-not yet been implemented in the IPC protocol.
-
-Commands with named arguments
-----------------------------
-
-If the ``command`` field is a JSON object, named arguments are expected. This
-is described in the C API ``mpv_command_node()`` documentation (the
-``MPV_FORMAT_NODE_MAP`` case). In some cases, this may make commands more
-readable, while some obscure commands basically require using named arguments.
-
-Currently, only "proper" commands (as listed by `List of Input Commands`_)
-support named arguments.
-
 Commands
 --------

@@ -338,50 +258,4 @@ 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 "\u" escape
-sequences. This includes surrogate pairs.
-
-JSON extensions
---------------
-
-The following non-standard extensions are supported:
-
-    - a list or object item can have a trailing ","
-    - object syntax accepts "=" in addition of ":"
-    - object keys can be unquoted, if they start with a character in "A-Za-z\_"
-      and contain only characters in "A-Za-z0-9\_"
-    - byte escapes with "\xAB" are allowed (with AB being a 2 digit hex number)
-
-Example:
-
-::
-
-    { objkey = "value\x0A" }
-
-Is equivalent to:
-
-::
-
-    { "objkey": "value\n" }
-
-Alternative ways of starting clients
------------------------------------
-
-You can create an anonymous IPC connection without having to set
-``--input-ipc-server``. This is achieved through a mpv pseudo scripting backend
-that starts processes.
-
-You can put ``.run`` file extension in the mpv scripts directory in its  config
-directory (see the `FILES`_ section for details), or load them through other
-means (see `Script location`_). These scripts are simply executed with the OS
-native mechanism (as if you ran them in the shell). They must have a proper
-shebang and have the executable bit set.
-
-When executed, a socket (the IPC connection) is passed to them through file
-descriptor inheritance. The file descriptor is indicated as the special command
-line argument ``--mpv-ipc-fd=N``, where ``N`` is the numeric file descriptor.
-
-The rest is the same as with a normal ``--input-ipc-server`` IPC connection. mpv
-does not attempt to observe or other interact with the started script process.
-
-This does not work in Windows yet.
+mpv will not attempt to construct invalid UTF-8 with broken escape sequences.
@@ -58,7 +58,7 @@ 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 - https://mujs.com .
+MuJS pages on language features and platform support - http://mujs.com .

 Unsupported Lua APIs and their JS alternatives
 ----------------------------------------------
@@ -73,6 +73,12 @@ Unsupported Lua APIs and their JS alternatives

 ``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.
@@ -82,7 +88,7 @@ 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).
-Where the Lua APIs use ``nil`` to indicate error, JS APIs use ``undefined``.
+Otherwise, where the Lua APIs return ``nil`` on error, JS returns ``undefined``.

 ``mp.command(string)`` (LE)

@@ -90,13 +96,6 @@ Where the Lua APIs use ``nil`` to indicate error, JS APIs use ``undefined``.

 ``mp.command_native(table [,def])`` (LE)

-``id = mp.command_native_async(table [,fn])`` (LE) Notes: ``id`` is true-thy on
-success, ``error`` is empty string on success.
-
-``mp.abort_async_command(id)``
-
-``mp.del_property(name)`` (LE)
-
 ``mp.get_property(name [,def])`` (LE)

 ``mp.get_property_osd(name [,def])`` (LE)
@@ -135,8 +134,6 @@ success, ``error`` is empty string on success.

 ``mp.get_script_name()``

-``mp.get_script_directory()``
-
 ``mp.osd_message(text [,duration])``

 ``mp.get_wakeup_pipe()``
@@ -151,10 +148,6 @@ success, ``error`` is empty string on success.

 ``mp.unregister_script_message(name)``

-``mp.create_osd_overlay(format)``
-
-``mp.get_osd_size()``  (returned object has properties: width, height, aspect)
-
 ``mp.msg.log(level, ...)``

 ``mp.msg.fatal(...)``
@@ -175,8 +168,7 @@ success, ``error`` is empty string on success.

 ``mp.utils.readdir(path [, filter])`` (LE)

-``mp.utils.file_info(path)`` (LE) Note: like lua - this does NOT expand
-meta-paths like ``~~/foo`` (other JS file functions do expand meta paths).
+``mp.utils.file_info(path)`` (LE)

 ``mp.utils.split_path(path)``

@@ -186,14 +178,11 @@ meta-paths like ``~~/foo`` (other JS file functions do expand meta paths).

 ``mp.utils.subprocess_detached(t)``

-``mp.utils.get_env_list()``
-
 ``mp.utils.getpid()`` (LE)

-``mp.add_hook(type, priority, fn(hook))``
+``mp.add_hook(type, priority, fn)``

-``mp.options.read_options(obj [, identifier [, on_update]])`` (types:
-string/boolean/number)
+``mp.options.read_options(obj [, identifier])`` (types: string/boolean/number)

 Additional utilities
 --------------------
@@ -217,9 +206,8 @@ Additional utilities
    ``undefined`` if the variable is not defined.

 ``mp.utils.get_user_path(path)``
-    Trivial wrapper of the ``expand-path`` mpv command, returns a string.
-    ``read_file``, ``write_file``, ``append_file`` and ``require`` already
-    expand the path internally and accept mpv meta-paths like ``~~desktop/foo``.
+    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
@@ -230,12 +218,7 @@ Additional utilities
    prefixed with ``file://`` as simple protection against accidental arguments
    switch, e.g. ``mp.utils.write_file("file://~/abc.txt", "hello world")``.

-``mp.utils.append_file(fname, str)``
-    Same as ``mp.utils.write_file`` if the file ``fname`` does not exist. If it
-    does exist then append instead of overwrite.
-
-Note: ``read_file``, ``write_file`` and ``append_file`` throw on errors, allow
-text content only.
+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.
@@ -252,9 +235,6 @@ text content only.
    anything from the filesystem), and returns it as a function. Very similar
    to a ``Function`` constructor, but shows at stack traces as ``fname``.

-``mp.module_paths``
-    Global modules search paths array for the ``require`` function (see below).
-
 Timers (global)
 ---------------

@@ -293,11 +273,9 @@ CommonJS modules and ``require(id)``
 ------------------------------------

 CommonJS Modules are a standard system where scripts can export common functions
-for use by other scripts. Specifically, a module is a script which adds
-properties (functions, etc) to its pre-existing ``exports`` object, which
-another script can access with ``require(module-id)``. This runs the module and
-returns its ``exports`` object. Further calls to ``require`` for the same module
-will return its cached ``exports`` object without running the module again.
+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
@@ -307,20 +285,13 @@ 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 which starts with ``./`` or ``../`` is relative to the script or module
-which ``require`` it. Otherwise it's considered a top-level id (CommonJS term).
+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 considered a global module id and searched according
-to ``mp.module_paths`` in normal array order, e.g. ``require("x")`` tries to
-load ``x.js`` at one of the array paths, and id ``foo/x`` tries to load ``x.js``
-inside dir ``foo`` at one of the paths.
-
-The ``mp.module_paths`` array is empty by default except for scripts which are
-loaded as a directory where it contains one item - ``<directory>/modules/`` .
-The array may be updated from a script (or using custom init - see below) which
-will affect future calls to ``require`` for global module id's which are not
-already loaded/cached.
+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``
@@ -328,21 +299,6 @@ 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.

-Custom initialization
---------------------
-
-After mpv initializes the JavaScript environment for a script but before it
-loads the script - it tries to run the file ``init.js`` at the root of the mpv
-configuration directory. Code at this file can update the environment further
-for all scripts. E.g. if it contains ``mp.module_paths.push("/foo")`` then
-``require`` at all scripts will search global module id's also at ``/foo``
-(do NOT do ``mp.module_paths = ["/foo"];`` because this will remove existing
-paths - like ``<script-dir>/modules`` for scripts which load from a directory).
-
-The custom-init file is ignored if mpv is invoked with ``--no-config``.
-
-Before mpv 0.34, the file name was ``.init.js`` (with dot) at the same dir.
-
 The event loop
 --------------

@@ -10,9 +10,9 @@ 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
- https://mpv.io/manual/master/#options
- https://mpv.io/manual/master/#list-of-input-commands
- https://mpv.io/manual/master/#properties
+- 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
@@ -21,15 +21,15 @@ C PLUGINS
 You can write C plugins for mpv. These use the libmpv API, although they do not
 use the libmpv library itself.

-They are enabled by default if compiler supports linking with the ``-rdynamic``
-flag on Linux/BSD platforms. On Windows the are always enabled.
+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`` or ``.dll``
-file extension. They can also be explicitly loaded with the ``--script`` option.
+(see the `FILES`_ section for details). They must have a ``.so`` file extension.
+They can also be explicitly loaded with the ``--script`` option.

 API
 ---
@@ -64,13 +64,9 @@ Linkage to libmpv
 -----------------

 The current implementation requires that your plugins are **not** linked against
-libmpv. What your plugins use are not symbols from a libmpv binary, but
+libmpv. What your plugins uses are not symbols from a libmpv binary, but
 symbols from the mpv host binary.

-On Windows to make symbols from the host binary available, you have to define
-MPV_CPLUGIN_DYNAMIC_SYM when compiling cplugin. This will load symbols
-dynamically, before calling ``mpv_open_cplugin()``.
-
 Examples
 --------

@@ -1,7 +1,12 @@
 LUA SCRIPTING
 =============

-mpv can load Lua scripts. (See `Script location`_.)
+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
@@ -25,55 +30,6 @@ A script which leaves fullscreen mode when the player is paused:
    mp.observe_property("pause", "bool", on_pause_change)


-Script location
---------------
-
-Scripts can be passed to the ``--script`` option, and are automatically loaded
-from the ``scripts`` subdirectory of the mpv configuration directory (usually
-``~/.config/mpv/scripts/``).
-
-A script can be a single file. The file extension is used to select the
-scripting backend to use for it. For Lua, it is ``.lua``. If the extension is
-not recognized, an error is printed. (If an error happens, the extension is
-either mistyped, or the backend was not compiled into your mpv binary.)
-
-mpv internally loads the script's name by stripping the ``.lua`` extension and
-replacing all nonalphanumeric characters with ``_``. E.g., ``my-tools.lua``
-becomes ``my_tools``. If there are several scripts with the same name, it is
-made unique by appending a number. This is the name returned by
-``mp.get_script_name()``.
-
-Entries with ``.disable`` extension are always ignored.
-
-If a script is a directory (either if a directory is passed to ``--script``,
-or any sub-directories in the script directory, such as for example
-``~/.config/mpv/scripts/something/``), then the directory represents a single
-script. The player will try to load a file named ``main.x``, where ``x`` is
-replaced with the file extension. For example, if ``main.lua`` exists, it is
-loaded with the Lua scripting backend.
-
-You must not put any other files or directories that start with ``main.`` into
-the script's top level directory. If the script directory contains for example
-both ``main.lua`` and ``main.js``, only one of them will be loaded (and which
-one depends on mpv internals that may change any time). Likewise, if there is
-for example ``main.foo``, your script will break as soon as mpv adds a backend
-that uses the ``.foo`` file extension.
-
-mpv also appends the top level directory of the script to the start of Lua's
-package path so you can import scripts from there too. Be aware that this will
-shadow Lua libraries that use the same package path. (Single file scripts do not
-include mpv specific directories in the Lua package path. This was silently
-changed in mpv 0.32.0.)
-
-Using a script directory is the recommended way to package a script that
-consists of multiple source files, or requires other files (you can use
-``mp.get_script_directory()`` to get the location and e.g. load data files).
-
-Making a script a git repository, basically a repository which contains a
-``main.lua`` file in the root directory, makes scripts easily updateable
-(without the dangers of auto-updates). Another suggestion is to use git
-submodules to share common files or libraries.
-
 Details on the script initialization and lifecycle
 --------------------------------------------------

@@ -153,58 +109,12 @@ The ``mp`` module is preloaded, although it can be loaded manually with
 ``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. It also allows you to use named argument.
-
-    If the table is an array, each array item is like an argument in
-    ``mp.commandv()`` (but can be a native type instead of a string).
-
-    If the table contains string keys, it's interpreted as command with named
-    arguments. This requires at least an entry with the key ``name`` to be
-    present, which must be a string, and contains the command name. The special
-    entry ``_flags`` is optional, and if present, must be an array of
-    `Input Command Prefixes`_ to apply. All other entries are interpreted as
-    arguments.
+    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.command_native_async(table [,fn])``
-    Like ``mp.command_native()``, but the command is ran asynchronously (as far
-    as possible), and upon completion, fn is called. fn has three arguments:
-    ``fn(success, result, error)``:
-
-         ``success``
-            Always a Boolean and is true if the command was successful,
-            otherwise false.
-
-        ``result``
-            The result value (can be nil) in case of success, nil otherwise (as
-            returned by ``mp.command_native()``).
-
-        ``error``
-            The error string in case of an error, nil otherwise.
-
-    Returns a table with undefined contents, which can be used as argument for
-    ``mp.abort_async_command``.
-
-    If starting the command failed for some reason, ``nil, error`` is returned,
-    and ``fn`` is called indicating failure, using the same error value.
-
-    ``fn`` is always called asynchronously, even if the command failed to start.
-
-``mp.abort_async_command(t)``
-    Abort a ``mp.command_native_async`` call. The argument is the return value
-    of that command (which starts asynchronous execution of the command).
-    Whether this works and how long it takes depends on the command and the
-    situation. The abort call itself is asynchronous. Does not return anything.
-
-``mp.del_property(name)``
-    Delete the given property. See ``mp.get_property`` and `Properties`_ for more
-    information about properties. Most properties cannot be deleted.
-
-    Returns true on success, or ``nil, error`` on error.
-
 ``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
@@ -299,9 +209,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with
    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. (Omitting works as follows: either pass ``nil`` for ``name``,
-    or pass the ``fn`` argument in place of the name. The latter is not
-    recommended and is handled for compatibility only.)
+    internally.

    The last argument is used for optional flags. This is a table, which can
    have the following entries:
@@ -312,25 +220,11 @@ The ``mp`` module is preloaded, although it can be loaded manually with
        ``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 the following entries (and
-            may contain undocumented ones):
-
-                ``event``
-                    Set to one of the strings ``down``, ``repeat``, ``up`` or
-                    ``press`` (the latter if key up/down can't be tracked).
-
-                ``is_mouse``
-                    Boolean Whether the event was caused by a mouse button.
-
-                ``key_name``
-                    The name of they key that triggered this, or ``nil`` if
-                    invoked artificially. If the key name is unknown, it's an
-                    empty string.
-
-                ``key_text``
-                    Text if triggered by a text key, otherwise ``nil``. See
-                    description of ``script-binding`` command for details (this
-                    field is equivalent to the 5th argument).
+            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``.
@@ -418,41 +312,29 @@ The ``mp`` module is preloaded, although it can be loaded manually with
    of times in a row, only the last change triggers the change function. (The
    exact behavior depends on timing and other things.)

-    If a property is unavailable, or on error, the value argument to ``fn`` is
-    ``nil``. (The ``observe_property()`` call always succeeds, even if a
-    property does not exist.)
-
    In some cases the function is not called even if the property changes.
-    This depends on the property, and it's a valid feature request to ask for
-    better update handling of a specific property.
+    Whether this can happen depends on the property.

    If the ``type`` is ``none`` or ``nil``, sporadic property change events are
    possible. This means the change function ``fn`` can be called even if the
    property doesn't actually change.

-    You always get an initial change notification. This is meant to initialize
-    the user's state to the current value of the property.
-
 ``mp.unobserve_property(fn)``
    Undo ``mp.observe_property(..., fn)``. This removes all property handlers
    that are equal to the ``fn`` parameter. This uses normal Lua ``==``
    comparison, so be careful when dealing with closures.

-``mp.add_timeout(seconds, fn [, disabled])``
+``mp.add_timeout(seconds, fn)``
    Call the given function fn when the given number of seconds has elapsed.
    Note that the number of seconds can be fractional. For now, the timer's
    resolution may be as low as 50 ms, although this will be improved in the
    future.

-    If the ``disabled`` argument is set to ``true`` or a truthy value, the
-    timer will wait to be manually started with a call to its ``resume()``
-    method.
-
    This is a one-shot timer: it will be removed when it's fired.

    Returns a timer object. See ``mp.add_periodic_timer`` for details.

-``mp.add_periodic_timer(seconds, fn [, disabled])``
+``mp.add_periodic_timer(seconds, fn)``
    Call the given function periodically. This is like ``mp.add_timeout``, but
    the timer is re-added after the function fn is run.

@@ -491,8 +373,8 @@ The ``mp`` module is preloaded, although it can be loaded manually with
            (``true``). This value is used when the timer expires (but before
            the timer callback function fn is run).

-    Note that these are methods, and you have to call them using ``:`` instead
-    of ``.`` (Refer to https://www.lua.org/manual/5.2/manual.html#3.4.9 .)
+    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:

@@ -518,16 +400,11 @@ The ``mp`` module is preloaded, although it can be loaded manually with
    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
-    by appending a number. Any nonalphanumeric characters are replaced with ``_``.
+    by appending a number.

    .. admonition:: Example

-        The script ``/path/to/foo-script.lua`` becomes ``foo_script``.
-
-``mp.get_script_directory()``
-    Return the directory if this is a script packaged as directory (see
-    `Script location`_ for a description). Return nothing if this is a single
-    file script.
+        The script ``/path/to/fooscript.lua`` becomes ``fooscript``.

 ``mp.osd_message(text [,duration])``
    Show an OSD message on the screen. ``duration`` is in seconds, and is
@@ -539,6 +416,18 @@ Advanced mp functions
 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).
+
+``mp.resume()``
+    This function has been deprecated in mpv 0.21.0 and does nothing starting
+    with mpv 0.23.0 (no replacement).
+
+``mp.resume_all()``
+    This function has been deprecated in mpv 0.21.0 and does nothing starting
+    with mpv 0.23.0 (no replacement).
+
 ``mp.get_wakeup_pipe()``
    Calls ``mpv_get_wakeup_pipe()`` and returns the read end of the wakeup
    pipe. This is deprecated, but still works. (See ``client.h`` for details.)
@@ -593,42 +482,6 @@ are useful only in special situations.
    Undo a previous registration with ``mp.register_script_message``. Does
    nothing if the ``name`` wasn't registered.

-``mp.create_osd_overlay(format)``
-    Create an OSD overlay. This is a very thin wrapper around the ``osd-overlay``
-    command. The function returns a table, which mostly contains fields that
-    will be passed to ``osd-overlay``. The ``format`` parameter is used to
-    initialize the ``format`` field. The ``data`` field contains the text to
-    be used as overlay. For details, see the ``osd-overlay`` command.
-
-    In addition, it provides the following methods:
-
-    ``update()``
-        Commit the OSD overlay to the screen, or in other words, run the
-        ``osd-overlay`` command with the current fields of the overlay table.
-        Returns the result of the ``osd-overlay`` command itself.
-
-    ``remove()``
-        Remove the overlay from the screen. A ``update()`` call will add it
-        again.
-
-    Example:
-
-    ::
-
-        ov = mp.create_osd_overlay("ass-events")
-        ov.data = "{\\an5}{\\b1}hello world!"
-        ov:update()
-
-    The advantage of using this wrapper (as opposed to running ``osd-overlay``
-    directly) is that the ``id`` field is allocated automatically.
-
-``mp.get_osd_size()``
-    Returns a tuple of ``osd_width, osd_height, osd_par``. The first two give
-    the size of the OSD in pixels (for video outputs like ``--vo=xv``, this may
-    be "scaled" pixels). The third is the display pixel aspect ratio.
-
-    May return invalid/nonsense values if OSD is not initialized yet.
-
 mp.msg functions
 ----------------

@@ -659,38 +512,25 @@ command-line. All you have to do is to supply a table with default options to
 the read_options function. The function will overwrite the default values
 with values found in the config-file and the command-line (in that order).

-``options.read_options(table [, identifier [, on_update]])``
+``options.read_options(table [, identifier])``
    A ``table`` with key-value pairs. The type of the default values is
    important for converting the values read from the config file or
    command-line back. Do not use ``nil`` as a default value!

    The ``identifier`` is used to identify the config-file and the command-line
    options. These needs to unique to avoid collisions with other scripts.
-    Defaults to ``mp.get_script_name()`` if the parameter is ``nil`` or missing.
-
-    The ``on_update`` parameter enables run-time updates of all matching option
-    values via the ``script-opts`` option/property. If any of the matching
-    options changes, the values in the ``table`` (which was originally passed to
-    the function) are changed, and ``on_update(list)`` is called. ``list`` is
-    a table where each updated option has a ``list[option_name] = true`` entry.
-    There is no initial ``on_update()`` call. This never re-reads the config file.
-    ``script-opts`` is always applied on the original config file, ignoring
-    previous ``script-opts`` values (for example, if an option is removed from
-    ``script-opts`` at runtime, the option will have the value in the config
-    file). ``table`` entries are only written for option values whose values
-    effectively change (this is important if the script changes ``table``
-    entries independently).
+    Defaults to ``mp.get_script_name()``.


 Example implementation::

+    require 'mp.options'
    local options = {
        optionA = "defaultvalueA",
        optionB = -0.5,
        optionC = true,
    }
-
-    require "mp.options".read_options(options, "myscript")
+    read_options(options, "myscript")
    print(options.optionA)


@@ -769,7 +609,7 @@ strictly part of the guaranteed API.
        ``mtime``
            time of last modification
        ``ctime``
-            time of last metadata change
+            time of last metadata change (Linux) / time of creation (Windows)
        ``is_file``
            Whether ``path`` is a regular file (boolean)
        ``is_dir``
@@ -781,7 +621,7 @@ strictly part of the guaranteed API.
    The booleans ``is_file`` and ``is_dir`` are provided as a convenience;
    they can be and are derived from ``mode``.

-    On error (e.g. path does not exist), ``nil, error`` is returned.
+    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
@@ -790,29 +630,49 @@ strictly part of the guaranteed API.

 ``utils.join_path(p1, p2)``
    Return the concatenation of the 2 paths. Tries to be clever. For example,
-    if ``p2`` is an absolute path, ``p2`` is returned without change.
+    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. This is a legacy wrapper around calling the
-    ``subprocess`` command with ``mp.command_native``. It does the following
-    things:
+    and the captured output.

-    - copy the table ``t``
-    - rename ``cancellable`` field to ``playback_only``
-    - rename ``max_size`` to ``capture_size``
-    - set ``capture_stdout`` field to ``true`` if unset
-    - set ``name`` field to ``subprocess``
-    - call ``mp.command_native(copied_t)``
-    - if the command failed, create a dummy result table
-    - copy ``error_string`` to ``error`` field if the string is non-empty
-    - return the result table
+    The parameter ``t`` is a table. The function reads the following entries:

-    It is recommended to use ``mp.command_native`` or ``mp.command_native_async``
-    directly, instead of calling this legacy wrapper. It is for compatibility
-    only.
+        ``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.

-    See the ``subprocess`` documentation for semantics and further parameters.
+        ``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.
@@ -825,17 +685,10 @@ strictly part of the guaranteed API.

    The function returns ``nil``.

-    This is a legacy wrapper around calling the ``run`` command with
-    ``mp.commandv`` and other functions.
-
 ``utils.getpid()``
    Returns the process ID of the running mpv process. This can be used to identify
    the calling mpv when launching (detached) subprocesses.

-``utils.get_env_list()``
-    Returns the C environment as a list of strings. (Do not confuse this with
-    the Lua "environment", which is an unrelated concept.)
-
 ``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
@@ -881,7 +734,116 @@ Example:

    mp.register_event("file-loaded", my_fn)

-For the existing event types, see `List of events`_.
+
+
+List of events
+--------------
+
+``start-file``
+    Happens right before a new file is loaded. When you receive this, the
+    player is loading the file (or possibly already done with it).
+
+``end-file``
+    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.)
+
+``playback-restart``
+    Start of playback after seek or after file was loaded.
+
+``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.
+
+``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
+    to avoid wasting CPU when the player is paused.
+
+``shutdown``
+    Sent when the player quits, and the script should terminate. Normally
+    handled automatically. See `Details on the script initialization and lifecycle`_.
+
+``log-message``
+    Receives messages enabled with ``mp.enable_messages``. The message data
+    is contained in the table passed as first parameter to the event handler.
+    The table contains, in addition to the default event fields, the following
+    fields:
+
+    ``prefix``
+        The module prefix, identifies the sender of the message. This is what
+        the terminal player puts in front of the message text when using the
+        ``--v`` option, and is also what is used for ``--msg-level``.
+
+    ``level``
+        The log level as string. See ``msg.log`` for possible log level names.
+        Note that later versions of mpv might add new levels or remove
+        (undocumented) existing ones.
+
+    ``text``
+        The log message. The text will end with a newline character. Sometimes
+        it can contain multiple lines.
+
+    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
+    any time.
+
+``get-property-reply``
+    Undocumented (not useful for Lua scripts).
+
+``set-property-reply``
+    Undocumented (not useful for Lua scripts).
+
+``command-reply``
+    Undocumented (not useful for Lua scripts).
+
+``client-message``
+    Undocumented (used internally).
+
+``video-reconfig``
+    Happens on video output or filter reconfig.
+
+``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.

 Extras
 ------
@@ -895,22 +857,8 @@ guarantee a stable interface.
    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(hook)`` is the function that will be called during execution of the
-    hook. The parameter passed to it (``hook``) is a Lua object that can control
-    further aspects about the currently invoked hook. It provides the following
-    methods:
-
-        ``defer()``
-            Returning from the hook function should not automatically continue
-            the hook. Instead, the API user wants to call ``hook:cont()`` on its
-            own at a later point in time (before or after the function has
-            returned).
-
-        ``cont()``
-            Continue the hook. Doesn't need to be called unless ``defer()`` was
-            called.
+    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
@@ -43,8 +43,7 @@ pl next
    =============   ================================================

 title
-    | Displays current media-title, filename, custom title, or target chapter
-      name while hovering the seekbar.
+    | Displays current media-title, filename, or custom title

    =============   ================================================
    left-click      show playlist position and length and full title
@@ -85,7 +84,6 @@ seekbar

    =============   ================================================
    left-click      seek to position
-    mouse wheel     seek forward/backward
    =============   ================================================

 time left
@@ -102,7 +100,6 @@ audio and sub
    left-click      cycle audio/sub tracks forward
    right-click     cycle audio/sub tracks backwards
    shift+L-click   show available audio/sub tracks
-    mouse wheel     cycle audio/sub tracks forward/backwards
    =============   ================================================

 vol
@@ -170,46 +167,18 @@ Configurable Options
 ``seekbarstyle``
    Default: bar

-    Sets the style of the playback position marker and overall shape
-    of the seekbar: ``bar``, ``diamond`` or ``knob``.
-
-``seekbarhandlesize``
-    Default: 0.6
-
-    Size ratio of the seek handle if ``seekbarstyle`` is set to ``diamond``
-    or ``knob``. This is relative to the full height of the seekbar.
+    Sets the style of the seekbar, slider (diamond marker), knob (circle
+    marker with guide), or bar (fill).
+    Default pre-0.21.0 was 'slider'.

 ``seekbarkeyframes``
    Default: yes

-    Controls the mode used to seek when dragging the seekbar. If set to ``yes``,
-    default seeking mode is used (usually keyframes, but player defaults and
-    heuristics can change it to exact). If set to ``no``, exact seeking on
-    mouse drags will be used instead. Keyframes are preferred, but exact seeks
-    may be useful in cases where keyframes cannot be found. Note that using
-    exact seeks can potentially make mouse dragging much slower.
-
-``seekrangestyle``
-    Default: inverted
-
-    Display seekable ranges on the seekbar. ``bar`` shows them on the full
-    height of the bar, ``line`` as a thick line and ``inverted`` as a thin
-    line that is inverted over playback position markers. ``none`` will hide
-    them. Additionally, ``slider`` will show a permanent handle inside the seekbar
-    with cached ranges marked inside. Note that these will look differently
-    based on the seekbarstyle option. Also, ``slider`` does not work with
-    ``seekbarstyle`` set to ``bar``.
-
-``seekrangeseparate``
-    Default: yes
-
-    Controls whether to show line-style seekable ranges on top of the
-    seekbar or separately if ``seekbarstyle`` is set to ``bar``.
-
-``seekrangealpha``
-    Default: 200
-
-    Alpha of the seekable ranges, 0 (opaque) to 255 (fully transparent).
+    Controls the mode used to seek when dragging the seekbar. By default,
+    keyframes are used. If set to false, exact seeking on mouse drags
+    will be used instead. Keyframes are preferred, but exact seeks may be
+    useful in cases where keyframes cannot be found. Note that using exact
+    seeks can potentially make mouse dragging much slower.

 ``deadzonesize``
    Default: 0.5
@@ -238,11 +207,6 @@ Configurable Options

    Enable the OSC when fullscreen

-``idlescreen``
-    Default: yes
-
-    Show the mpv logo and message when idle
-
 ``scalewindowed``
    Default: 1.0

@@ -312,25 +276,15 @@ Configurable Options

    Show total time instead of time remaining

-``remaining_playtime``
-    Default: yes
-
-    Whether the time-remaining display takes speed into account.
-    ``yes`` - how much playback time remains at the current speed.
-    ``no`` - how much video-time remains.
-
 ``timems``
    Default: no

    Display timecodes with milliseconds

-``tcspace``
-    Default: 100 (allowed: 50-200)
+``seekranges``
+    Default: yes

-    Adjust space reserved for timecodes (current time and time remaining) in
-    the ``bottombar`` and ``topbar`` layouts. The timecode width depends on the
-    font, and with some fonts the spacing near the timecodes becomes too small.
-    Use values above 100 to increase that spacing, or below 100 to decrease it.
+    Display seekable ranges on the seekbar

 ``visibility``
    Default: auto (auto hide/show on mouse move)
@@ -345,85 +299,6 @@ Configurable Options
    default is conservative to allow wide fonts to be used without overflow.
    However, with many common fonts a bigger number can be used. YMMV.

-``boxvideo``
-    Default: no
-
-    Whether to overlay the osc over the video (``no``), or to box the video
-    within the areas not covered by the osc (``yes``). If this option is set,
-    the osc may overwrite the ``--video-margin-ratio-*`` options, even if the
-    user has set them. (It will not overwrite them if all of them are set to
-    default values.) Additionally, ``visibility`` must be set to ``always``.
-    Otherwise, this option does nothing.
-
-    Currently, this is supported for the ``bottombar`` and ``topbar`` layout
-    only. The other layouts do not change if this option is set. Separately,
-    if window controls are present (see below), they will be affected
-    regardless of which osc layout is in use.
-
-    The border is static and appears even if the OSC is configured to appear
-    only on mouse interaction. If the OSC is invisible, the border is simply
-    filled with the background color (black by default).
-
-    This currently still makes the OSC overlap with subtitles (if the
-    ``--sub-use-margins`` option is set to ``yes``, the default). This may be
-    fixed later.
-
-    This does not work correctly with video outputs like ``--vo=xv``, which
-    render OSD into the unscaled video.
-
-``windowcontrols``
-    Default: auto (Show window controls if there is no window border)
-
-    Whether to show window management controls over the video, and if so,
-    which side of the window to place them. This may be desirable when the
-    window has no decorations, either because they have been explicitly
-    disabled (``border=no``) or because the current platform doesn't support
-    them (eg: gnome-shell with wayland).
-
-    The set of window controls is fixed, offering ``minimize``, ``maximize``,
-    and ``quit``. Not all platforms implement ``minimize`` and ``maximize``,
-    but ``quit`` will always work.
-
-``windowcontrols_alignment``
-    Default: right
-
-    If window controls are shown, indicates which side should they be aligned
-    to.
-
-    Supports ``left`` and ``right`` which will place the controls on those
-    respective sides.
-
-``greenandgrumpy``
-    Default: no
-
-    Set to ``yes`` to reduce festivity (i.e. disable santa hat in December.)
-
-``livemarkers``
-    Default: yes
-
-    Update chapter markers positions on duration changes, e.g. live streams.
-    The updates are unoptimized - consider disabling it on very low-end systems.
-
-``chapters_osd``, ``playlist_osd``
-    Default: yes
-
-    Whether to display the chapters/playlist at the OSD when left-clicking the
-    next/previous OSC buttons, respectively.
-
-``chapter_fmt``
-    Default: ``Chapter: %s``
-
-    Template for the chapter-name display when hovering the seekbar.
-    Use ``no`` to disable chapter display on hover. Otherwise it's a lua
-    ``string.format`` template and ``%s`` is replaced with the actual name.
-
-``unicodeminus``
-    Default: no
-
-    Use a Unicode minus sign instead of an ASCII hyphen when displaying
-    the remaining playback time.
-
-
 Script Commands
 ~~~~~~~~~~~~~~~

@@ -446,10 +321,6 @@ to set auto mode (the default) with ``b``::
    a script-message osc-visibility never
    b script-message osc-visibility auto

-``osc-idlescreen``
-    Controls the visibility of the mpv logo on idle. Valid arguments are ``yes``,
-    ``no``, and ``cycle`` to toggle between yes and no.
-
 ``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.
@@ -22,18 +22,15 @@ stats:

 ====   ==================
 1      Show usual stats
-2      Show frame timings (scroll)
-3      Input cache stats
-4      Active key bindings (scroll)
-0      Internal stuff (scroll)
+2      Show frame timings
 ====   ==================

-On pages which support scroll, these key bindings are also active:
+Font
+~~~~

-====   ==================
-UP      Scroll one line up
-DOWN    Scroll one line down
-====   ==================
+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
 -------------
@@ -45,28 +42,20 @@ 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_page_3``
-    Default: 3
-``key_page_4``
-    Default: 4
-``key_page_0``
-    Default: 0

    Key bindings for page switching while stats are displayed.

-``key_scroll_up``
-    Default: UP
-``key_scroll_down``
-    Default: DOWN
-``scroll_lines``
-    Default: 1
-
-    Scroll key bindings and number of lines to scroll on pages which support it.
-
 ``duration``
    Default: 4

@@ -97,24 +86,19 @@ Configurable Options

    Show graphs for vsync and jitter values (page 1). Only when toggled.

-``plot_tonemapping_lut``
-    Default: no
-
-    Enable tone-mapping LUT visualization automatically. Only when toggled.
-
 ``flush_graph_data``
    Default: yes

    Clear data buffers used for drawing graphs when toggling.

 ``font``
-    Default: sans-serif
+    Default: Source Sans Pro

    Font name. Should support as many font weights as possible for optimal
    visual experience.

 ``font_mono``
-    Default: monospace
+    Default: Source Sans Pro

    Font name for parts where monospaced characters are necessary to align
    text. Currently, monospaced digits are sufficient.
@@ -165,69 +149,14 @@ Note: colors are given as hexadecimal values and use ASS tag order: BBGGRR
 Different key bindings
 ~~~~~~~~~~~~~~~~~~~~~~

-Additional keys can be configured in ``input.conf`` to display the stats::
+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

-And to display a certain page directly::
+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
-
-Active key bindings page
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-Lists the active key bindings and the commands they're bound to, excluding the
-interactive keys of the stats script itself. See also ``--input-test`` for more
-detailed view of each binding.
-
-The keys are grouped automatically using a simple analysis of the command
-string, and one should not expect documentation-level grouping accuracy,
-however, it should still be reasonably useful.
-
-Using ``--idle --script-opts=stats-bindlist=yes`` will print the list to the
-terminal and quit immediately. By default long lines are shortened to 79 chars,
-and terminal escape sequences are enabled. A different length limit can be
-set by changing ``yes`` to a number (at least 40), and escape sequences can be
-disabled by adding ``-`` before the value, e.g. ``...=-yes`` or ``...=-120``.
-
-Like with ``--input-test``, the list includes bindings from ``input.conf`` and
-from user scripts. Use ``--no-config`` to list only built-in bindings.
-
-Internal stuff page
-~~~~~~~~~~~~~~~~~~~
-
-Most entries shown on this page have rather vague meaning. Likely none of this
-is useful for you. Don't attempt to use it. Forget its existence.
-
-Selecting this for the first time will start collecting some internal
-performance data. That means performance will be slightly lower than normal for
-the rest of the time the player is running (even if the stats page is closed).
-Note that the stats page itself uses a lot of CPU and even GPU resources, and
-may have a heavy impact on performance.
-
-The displayed information is accumulated over the redraw delay (shown as
-``poll-time`` field).
-
-This adds entries for each Lua script. If there are too many scripts running,
-parts of the list will simply be out of the screen, but it can be scrolled.
-
-If the underlying platform does not support pthread per thread times, the
-displayed times will be 0 or something random (I suspect that at time of this
-writing, only Linux provides the correct via pthread APIs for per thread times).
-
-Most entries are added lazily and only during data collection, which is why
-entries may pop up randomly after some time. It's also why the memory usage
-entries for scripts that have been inactive since the start of data collection
-are missing.
-
-Memory usage is approximate and does not reflect internal fragmentation.
-
-JS scripts memory reporting is disabled by default because collecting the data
-at the JS side has an overhead and will increase memory usage. It can be
-enabled by setting the ``--js-memory-report`` option before starting mpv.
-
-If entries have ``/time`` and ``/cpu`` variants, the former gives the real time
-(monotonic clock), while the latter the thread CPU time (only if the
-corresponding pthread API works and is supported).
@@ -44,21 +44,23 @@ The exact syntax is:
    the ``lavfi`` filter, which uses a very similar syntax as mpv (MPlayer
    historically) to specify filters and their parameters.

-.. note::
-
-    ``--vf`` can only take a single track as input, even if the filter supports
-    dynamic input. Filters that require multiple inputs can't be used.
-    Use ``--lavfi-complex`` for such a use case. This also applies for ``--af``.
-
 Filters can be manipulated at run time. You can use ``@`` labels as described
 above in combination with the ``vf`` command (see `COMMAND INTERFACE`_) to get
 more control over this. Initially disabled filters with ``!`` are useful for
 this as well.

+You can also set defaults for each filter. The defaults are applied before the
+normal filter parameters. This is deprecated and never worked for the
+libavfilter bridge.
+
+``--vf-defaults=<filter1[=parameter1:parameter2:...],filter2,...>``
+    Set defaults for each filter. (Deprecated. ``--af-defaults`` is deprecated
+    as well.)
+
 .. note::

    To get a full list of available video filters, see ``--vf=help`` and
-    https://ffmpeg.org/ffmpeg-filters.html .
+    http://ffmpeg.org/ffmpeg-filters.html .

    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
@@ -83,9 +85,6 @@ this as well.
 Video filters are managed in lists. There are a few commands to manage the
 filter list.

-``--vf-append=filter``
-    Appends the filter given as arguments to the filter list.
-
 ``--vf-add=filter``
    Appends the filter given as arguments to the filter list. (Passing multiple
    filters is currently still possible, but deprecated.)
@@ -94,19 +93,12 @@ filter list.
    Prepends the filters given as arguments to the filter list. (Passing
    multiple filters is currently still possible, but deprecated.)

-``--vf-remove=filter``
-    Deletes the filter from the list. The filter can be either given the way it
-    was added (filter name and its full argument list), or by label (prefixed
-    with ``@``). Matching of filters works as follows: if either of the compared
-    filters has a label set, only the labels are compared. If none of the
-    filters have a label, the filter name, arguments, and argument order are
-    compared. (Passing multiple filters is currently still possible, but
-    deprecated.)
-
-``-vf-toggle=filter``
-    Add the given filter to the list if it was not present yet, or remove it
-    from the list if it was present. Matching of filters works as described in
-    ``--vf-remove``.
+``--vf-del=filter``
+    Deletes the filter. The filter can even given the way it was added (filter
+    name and its full argument list), by label (prefixed with ``@``), or as
+    index number. Index numbers start at 0, negative numbers address the end of
+    the list (-1 is the last). (Passing multiple filters is currently still
+    possible, but deprecated.)

 ``--vf-clr``
    Completely empties the filter list.
@@ -120,65 +112,15 @@ With filters that support it, you can access parameters by their name.
 Available mpv-only filters are:

 ``format=fmt=<value>:colormatrix=<value>:...``
-    Applies video parameter overrides, with optional conversion. By default,
-    this overrides the video's parameters without conversion (except for the
-    ``fmt`` parameter), but can be made to perform an appropriate conversion
-    with ``convert=yes`` for parameters for which conversion is supported.
+    Restricts the color space for the next filter without doing any conversion.
+    Use together with the scale filter for a real conversion.
+
+    .. note::
+
+        For a list of available formats, see ``format=fmt=help``.

    ``<fmt>``
-        Image format name, e.g. rgb15, bgr24, 420p, etc. (default: don't change).
-
-        This filter always performs conversion to the given format.
-
-        .. note::
-
-            For a list of available formats, use ``--vf=format=fmt=help``.
-
-        .. note::
-
-            Conversion between hardware formats is supported in some cases.
-            eg: ``cuda`` to ``vulkan``, or ``vaapi`` to ``vulkan``.
-
-    ``<convert=yes|no>``
-        Force conversion of color parameters (default: no).
-
-        If this is disabled (the default), the only conversion that is possibly
-        performed is format conversion if ``<fmt>`` is set. All other parameters
-        (like ``<colormatrix>``) are forced without conversion. This mode is
-        typically useful when files have been incorrectly tagged.
-
-        If this is enabled, libswscale or zimg is used if any of the parameters
-        mismatch. zimg is used of the input/output image formats are supported
-        by mpv's zimg wrapper, and if ``--sws-allow-zimg=yes`` is used. Both
-        libraries may not support all kinds of conversions. This typically
-        results in silent incorrect conversion. zimg has in many cases a better
-        chance of performing the conversion correctly.
-
-        In both cases, the color parameters are set on the output stage of the
-        image format conversion (if ``fmt`` was set). The difference is that
-        with ``convert=no``, the color parameters are not passed on to the
-        converter.
-
-        If input and output video parameters are the same, conversion is always
-        skipped.
-
-        When converting between hardware formats, this parameter has no effect,
-        and the only conversion that is done is the format conversion.
-
-        .. admonition:: Examples
-
-            ``mpv test.mkv --vf=format:colormatrix=ycgco``
-                Results in incorrect colors (if test.mkv was tagged correctly).
-
-            ``mpv test.mkv --vf=format:colormatrix=ycgco:convert=yes --sws-allow-zimg``
-                Results in true conversion to ``ycgco``, assuming the renderer
-                supports it (``--vo=gpu`` normally does). You can add ``--vo=xv``
-                to force a VO which definitely does not support it, which should
-                show incorrect colors as confirmation.
-
-                Using ``--sws-allow-zimg=no`` (or disabling zimg at build time)
-                will use libswscale, which cannot perform this conversion as
-                of this writing.
+        Format name, e.g. rgb15, bgr24, 420p, etc. (default: don't change).

    ``<colormatrix>``
        Controls the YUV to RGB color space conversion when playing video. There
@@ -274,10 +216,7 @@ Available mpv-only filters are:
       :srgb:         IEC 61966-2-4 (sRGB)
       :linear:       Linear light
       :gamma1.8:     Pure power curve (gamma 1.8)
-       :gamma2.0:     Pure power curve (gamma 2.0)
       :gamma2.2:     Pure power curve (gamma 2.2)
-       :gamma2.4:     Pure power curve (gamma 2.4)
-       :gamma2.6:     Pure power curve (gamma 2.6)
       :gamma2.8:     Pure power curve (gamma 2.8)
       :prophoto:     ProPhoto RGB (ROMM) curve
       :pq:           ITU-R BT.2100 PQ (Perceptual quantizer) curve
@@ -309,31 +248,18 @@ Available mpv-only filters are:
       :709-1886:     Scene-referred using the BT709+BT1886 interaction
       :gamma1.2:     Scene-referred using a pure power OOTF (gamma=1.2)

-    ``<dolbyvision=yes|no>``
-        Whether or not to include Dolby Vision metadata (default: yes). If
-        disabled, any Dolby Vision metadata will be stripped from frames.
-
-    ``<film-grain=yes|no>``
-        Whether or not to include film grain metadata (default: yes). If
-        disabled, any film grain metadata will be stripped from frames.
-
    ``<stereo-in>``
-        Set the stereo mode the video is assumed to be encoded in. Use
-        ``--vf=format:stereo-in=help`` to list all available modes. Check with
-        the ``stereo3d`` filter documentation to see what the names mean.
+        Set the stereo mode the video is assumed to be encoded in. Takes the
+        same values as the ``--video-stereo-mode`` option.

    ``<stereo-out>``
        Set the stereo mode the video should be displayed as. Takes the
-        same values as the ``stereo-in`` option.
+        same values as the ``--video-stereo-mode`` option.

    ``<rotate>``
        Set the rotation the video is assumed to be encoded with in degrees.
        The special value ``-1`` uses the input format.

-    ``<w>``, ``<h>``
-        If not 0, perform conversion to the given size. Ignored if
-        ``convert=yes`` is not set.
-
    ``<dw>``, ``<dh>``
        Set the display size. Note that setting the display size such that
        the video is scaled in both directions instead of just changing the
@@ -344,17 +270,16 @@ Available mpv-only filters are:
        but values such as ``[16:9]`` can be passed too (``[...]`` for quoting
        to prevent the option parser from interpreting the ``:`` character).

-    ``<force-scaler=auto|zimg|sws>``
-        Force a specific scaler backend, if applicable. This is a debug option
-        and could go away any time.
+    ``<spherical-type>``
+        Type of the spherical projection:

-    ``<alpha=auto|straight|premul>``
-        Set the kind of alpha the video uses. Undefined effect if the image
-        format has no alpha channel (could be ignored or cause an error,
-        depending on how mpv internals evolve). Setting this may or may not
-        cause downstream image processing to treat alpha differently, depending
-        on support. With ``convert`` and zimg used, this will convert the alpha.
-        libswscale and other FFmpeg components completely ignore this.
+        :auto:      As indicated by the file (default)
+        :none:      Normal video
+        :equirect:  Equirectangular
+        :unknown:   Unknown projection
+
+    ``<spherical-yaw>``, ``<spherical-pitch>``, ``<spherical-roll>``
+        Reference angle in degree, if spherical video is used.

 ``lavfi=graph[:sws-flags[:o=opts]]``
    Filter video using FFmpeg's libavfilter.
@@ -398,7 +323,7 @@ Available mpv-only filters are:
        option gives the flags which should be passed to libswscale. This
        option is numeric and takes a bit-wise combination of ``SWS_`` flags.

-        See ``https://git.videolan.org/?p=ffmpeg.git;a=blob;f=libswscale/swscale.h``.
+        See ``http://git.videolan.org/?p=ffmpeg.git;a=blob;f=libswscale/swscale.h``.

    ``<o>``
        Set AVFilterGraph options. These should be documented by FFmpeg.
@@ -435,38 +360,29 @@ Available mpv-only filters are:
    of that will return errors. As such, you can't use the full power of
    VapourSynth, but you can use certain filters.

-    .. warning::
-
-        Do not use this filter, unless you have expert knowledge in VapourSynth,
-        and know how to fix bugs in the mpv VapourSynth wrapper code.
-
-    If you just want to play video generated by VapourSynth (i.e. using
+    If you just want to play video generated by a VapourSynth (i.e. using
    a native VapourSynth video source), it's better to use ``vspipe`` and a
-    pipe or FIFO to feed the video to mpv. The same applies if the filter script
+    FIFO to feed the video to mpv. The same applies if the filter script
    requires random frame access (see ``buffered-frames`` parameter).

+    This filter is experimental. If it turns out that it works well and is
+    used, it will be ported to libavfilter. Otherwise, it will be just removed.
+
    ``file``
        Filename of the script source. Currently, this is always a python
-        script (``.vpy`` in VapourSynth convention).
-
-        The variable ``video_in`` is set to the mpv video source, and it is
-        expected that the script reads video from it. (Otherwise, mpv will
-        decode no video, and the video packet queue will overflow, eventually
-        leading to only audio playing, or worse.)
-
-        The filter graph created by the script is also expected to pass through
-        timestamps using the ``_DurationNum`` and ``_DurationDen`` frame
-        properties.
-
-        See the end of the option list for a full list of script variables
-        defined by mpv.
+        script. The variable ``video_in`` is set to the mpv video source,
+        and it is expected that the script reads video from it. (Otherwise,
+        mpv will decode no video, and the video packet queue will overflow,
+        eventually leading to audio being stopped.) The script is also
+        expected to pass through timestamps using the ``_DurationNum`` and
+        ``_DurationDen`` frame properties.

        .. admonition:: Example:

            ::

                import vapoursynth as vs
-                from vapoursynth import core
+                core = vs.get_core()
                core.std.AddBorders(video_in, 10, 10, 20, 20).set_output()

        .. warning::
@@ -477,61 +393,21 @@ Available mpv-only filters are:
    ``buffered-frames``
        Maximum number of decoded video frames that should be buffered before
        the filter (default: 4). This specifies the maximum number of frames
-        the script can request in backward direction.
-
+        the script can request in reverse direction.
        E.g. if ``buffered-frames=5``, and the script just requested frame 15,
        it can still request frame 10, but frame 9 is not available anymore.
        If it requests frame 30, mpv will decode 15 more frames, and keep only
        frames 25-30.

-        The only reason why this buffer exists is to serve the random access
-        requests the VapourSynth filter can make.
-
-        The VapourSynth API has a ``getFrameAsync`` function, which takes an
-        absolute frame number. Source filters must respond to all requests. For
-        example, a source filter can request frame 2432, and then frame 3.
-        Source filters  typically implement this by pre-indexing the entire
-        file.
-
-        mpv on the other hand is stream oriented, and does not allow filters to
-        seek. (And it would not make sense to allow it, because it would ruin
-        performance.) Filters get frames sequentially in playback direction, and
-        cannot request them out of order.
-
-        To compensate for this mismatch, mpv allows the filter to access frames
-        within a certain window. ``buffered-frames`` controls the size of this
-        window. Most VapourSynth filters happen to work with this, because mpv
-        requests frames sequentially increasing from it, and most filters only
-        require frames "close" to the requested frame.
-
-        If the filter requests a frame that has a higher frame number than the
-        highest buffered frame, new frames will be decoded until the requested
-        frame number is reached. Excessive frames will be flushed out in a FIFO
-        manner (there are only at most ``buffered-frames`` in this buffer).
-
-        If the filter requests a frame that has a lower frame number than the
-        lowest buffered frame, the request cannot be satisfied, and an error
-        is returned to the filter. This kind of error is not supposed to happen
-        in a "proper" VapourSynth environment. What exactly happens depends on
-        the filters involved.
-
-        Increasing this buffer will not improve performance. Rather, it will
-        waste memory, and slow down seeks (when enough frames to fill the buffer
-        need to be decoded at once). It is only needed to prevent the error
-        described in the previous paragraph.
-
-        How many frames a filter requires depends on filter implementation
-        details, and mpv has no way of knowing. A scale filter might need only
-        1 frame, an interpolation filter may require a small number of frames,
-        and the ``Reverse`` filter will require an infinite number of frames.
-
-        If you want reliable operation to the full extend VapourSynth is
-        capable, use ``vspipe``.
-
        The actual number of buffered frames also depends on the value of the
        ``concurrent-frames`` option. Currently, both option values are
        multiplied to get the final buffer size.

+        (Normally, VapourSynth source filters must provide random access, but
+        mpv was made for playback, and does not provide frame-exact random
+        access. The way this video filter works is a compromise to make simple
+        filters work anyway.)
+
    ``concurrent-frames``
        Number of frames that should be requested in parallel. The
        level of concurrency depends on the filter and how quickly mpv can
@@ -540,25 +416,15 @@ Available mpv-only filters are:
        making it higher than the number of cores can actually make it
        slower.

-        Technically, mpv will call the VapourSynth ``getFrameAsync`` function
-        in a loop, until there are ``concurrent-frames`` frames that have not
-        been returned by the filter yet. This also assumes that the rest of the
-        mpv filter chain reads the output of the ``vapoursynth`` filter quickly
-        enough. (For example, if you pause the player, filtering will stop very
-        soon, because the filtered frames are waiting in a queue.)
-
-        Actual concurrency depends on many other factors.
-
        By default, this uses the special value ``auto``, which sets the option
        to the number of detected logical CPU cores.

-    The following ``.vpy`` script variables are defined by mpv:
+    The following variables are defined by mpv:

    ``video_in``
-        The mpv video source as vapoursynth clip. Note that this has an
-        incorrect (very high) length set, which confuses many filters. This is
-        necessary, because the true number of frames is unknown. You can use the
-        ``Trim`` filter on the clip to reduce the length.
+        The mpv video source as vapoursynth clip. Note that this has no length
+        set, which confuses many filters. Using ``Trim`` on the clip with a
+        high dummy length can turn it into a finite clip.

    ``video_in_dw``, ``video_in_dh``
        Display size of the video. Can be different from video size if the
@@ -568,24 +434,42 @@ Available mpv-only filters are:
        FPS value as reported by file headers. This value can be wrong or
        completely broken (e.g. 0 or NaN). Even if the value is correct,
        if another filter changes the real FPS (by dropping or inserting
-        frames), the value of this variable will not be useful. Note that
-        the ``--container-fps-override`` command line option overrides this value.
+        frames), the value of this variable might not be useful. Note that
+        the ``--fps`` command line option overrides this value.

        Useful for some filters which insist on having a FPS.

    ``display_fps``
        Refresh rate of the current display. Note that this value can be 0.

-    ``display_res``
-        Resolution of the current display. This is an integer array with the
-        first entry corresponding to the width and the second entry coresponding
-        to the height. These values can be 0. Note that this will not respond to
-        monitor changes and may not work on all platforms.
+``vapoursynth-lazy``
+    The same as ``vapoursynth``, but doesn't load Python scripts. Instead, a
+    custom backend using Lua and the raw VapourSynth API is used. The syntax
+    is completely different, and absolutely no convenience features are
+    provided. There's no type checking either, and you can trigger crashes.
+
+    .. admonition:: Example:
+
+        ::
+
+            video_out = invoke("morpho", "Open", {clip = video_in})
+
+    The special variable ``video_in`` is the mpv video source, while the
+    special variable ``video_out`` is used to read video from. The 1st argument
+    is the plugin (queried with ``getPluginByNs``), the 2nd is the filter name,
+    and the 3rd argument is a table with the arguments. Positional arguments
+    are not supported. The types must match exactly. Since Lua is terrible and
+    can't distinguish integers and floats, integer arguments must be prefixed
+    with ``i_``, in which case the prefix is removed and the argument is cast
+    to an integer. Should the argument's name start with ``i_``, you're out of
+    luck.
+
+    Clips (VSNodeRef) are passed as light userdata, so trying to pass any
+    other userdata type will result in hard crashes.

 ``vavpp``
-    VA-API video post processing. Requires the system to support VA-API,
-    i.e. Linux/BSD only. Works with ``--vo=vaapi`` and ``--vo=gpu`` only.
-    Currently deinterlaces. This filter is automatically inserted if
+    VA-AP-API video post processing. Works with ``--vo=vaapi`` and ``--vo=gpu``
+    only. Currently deinterlaces. This filter is automatically inserted if
    deinterlacing is requested (either using the ``d`` key, by default mapped to
    the command ``cycle deinterlace``, or the ``--deinterlace`` option).

@@ -613,7 +497,7 @@ Available mpv-only filters are:

    ``reversal-bug=<yes|no>``
        :no:  Use the API as it was interpreted by older Mesa drivers. While
-              this interpretation was more obvious and intuitive, it was
+              this interpretation was more obvious and inuitive, it was
              apparently wrong, and not shared by Intel driver developers.
        :yes: Use Intel interpretation of surface forward and backwards
              references (default). This is what Intel drivers and newer Mesa
@@ -685,110 +569,3 @@ Available mpv-only filters are:
        which algorithm is actually selected. ``none`` always falls back. On
        most if not all hardware, this option will probably do nothing, because
        a video processor usually supports all modes or none.
-
-``fingerprint=...``
-    Compute video frame fingerprints and provide them as metadata. Actually, it
-    currently barely deserved to be called ``fingerprint``, because it does not
-    compute "proper" fingerprints, only tiny downscaled images (but which can be
-    used to compute image hashes or for similarity matching).
-
-    The main purpose of this filter is to support the ``skip-logo.lua`` script.
-    If this script is dropped, or mpv ever gains a way to load user-defined
-    filters (other than VapourSynth), this filter will be removed. Due to the
-    "special" nature of this filter, it will be removed without warning.
-
-    The intended way to read from the filter is using ``vf-metadata`` (also
-    see ``clear-on-query`` filter parameter). The property will return a list
-    of key/value pairs as follows:
-
-    ::
-
-        fp0.pts = 1.2345
-        fp0.hex = 1234abcdef...bcde
-        fp1.pts = 1.4567
-        fp1.hex = abcdef1234...6789
-        ...
-        fpN.pts = ...
-        fpN.hex = ...
-        type = gray-hex-16x16
-
-    Each ``fp<N>`` entry is for a frame. The ``pts`` entry specifies the
-    timestamp of the frame (within the filter chain; in simple cases this is
-    the same as the display timestamp). The ``hex`` field is the hex encoded
-    fingerprint, whose size and meaning depend on the ``type`` filter option.
-    The ``type`` field has the same value as the option the filter was created
-    with.
-
-    This returns the frames that were filtered since the last query of the
-    property. If ``clear-on-query=no`` was set, a query doesn't reset the list
-    of frames. In both cases, a maximum of 10 frames is returned. If there are
-    more frames, the oldest frames are discarded. Frames are returned in filter
-    order.
-
-    (This doesn't return a structured list for the per-frame details because the
-    internals of the ``vf-metadata`` mechanism suck. The returned format may
-    change in the future.)
-
-    This filter uses zimg for speed and profit. However, it will fallback to
-    libswscale in a number of situations: lesser pixel formats, unaligned data
-    pointers or strides, or if zimg fails to initialize for unknown reasons. In
-    these cases, the filter will use more CPU. Also, it will output different
-    fingerprints, because libswscale cannot perform the full range expansion we
-    normally request from zimg. As a consequence, the filter may be slower and
-    not work correctly in random situations.
-
-    ``type=...``
-        What fingerprint to compute. Available types are:
-
-        :gray-hex-8x8:      grayscale, 8 bit, 8x8 size
-        :gray-hex-16x16:    grayscale, 8 bit, 16x16 size (default)
-
-        Both types simply remove all colors, downscale the image, concatenate
-        all pixel values to a byte array, and convert the array to a hex string.
-
-    ``clear-on-query=yes|no``
-        Clear the list of frame fingerprints if the ``vf-metadata`` property for
-        this filter is queried (default: yes). This requires some care by the
-        user. Some types of accesses might query the filter multiple times,
-        which leads to lost frames.
-
-    ``print=yes|no``
-        Print computed fingerprints to the terminal (default: no). This is
-        mostly for testing and such. Scripts should use ``vf-metadata`` to
-        read information from this filter instead.
-
-``gpu=...``
-    Convert video to RGB using the OpenGL renderer normally used with
-    ``--vo=gpu``. This requires that the EGL implementation supports off-screen
-    rendering on the default display. (This is the case with Mesa.)
-
-    Sub-options:
-
-    ``w=<pixels>``, ``h=<pixels>``
-        Size of the output in pixels (default: 0). If not positive, this will
-        use the size of the first filtered input frame.
-
-    .. warning::
-
-        This is highly experimental. Performance is bad, and it will not work
-        everywhere in the first place. Some features are not supported.
-
-    .. warning::
-
-        This does not do OSD rendering. If you see OSD, then it has been
-        rendered by the VO backend. (Subtitles are rendered by the ``gpu``
-        filter, if possible.)
-
-    .. warning::
-
-        If you use this with encoding mode, keep in mind that encoding mode will
-        convert the RGB filter's output back to yuv420p in software, using the
-        configured software scaler. Using ``zimg`` might improve this, but in
-        any case it might go against your goals when using this filter.
-
-    .. warning::
-
-        Do not use this with ``--vo=gpu``. It will apply filtering twice, since
-        most ``--vo=gpu`` options are unconditionally applied to the ``gpu``
-        filter. There is no mechanism in mpv to prevent this.
-
@@ -21,47 +21,6 @@ in the list.

 Available video output drivers are:

-``gpu``
-    General purpose, customizable, GPU-accelerated video output driver. It
-    supports extended scaling methods, dithering, color management, custom
-    shaders, HDR, and more.
-
-    See `GPU renderer options`_ for options specific to this VO.
-
-    By default, mpv utilizes settings that balance quality and performance.
-    Additionally, two predefined profiles are available: ``fast`` for maximum
-    performance and ``high-quality`` for superior rendering quality. You can
-    apply a specific profile using the ``--profile=<name>`` option and inspect
-    its contents using ``--show-profile=<name>``.
-
-    This VO abstracts over several possible graphics APIs and windowing
-    contexts, which can be influenced using the ``--gpu-api`` and
-    ``--gpu-context`` options.
-
-    Hardware decoding over OpenGL-interop is supported to some degree. Note
-    that in this mode, some corner case might not be gracefully handled, and
-    color space conversion and chroma upsampling is generally in the hand of
-    the hardware decoder APIs.
-
-    ``gpu`` makes use of FBOs by default. Sometimes you can achieve better
-    quality or performance by changing the ``--fbo-format`` option to
-    ``rgb16f``, ``rgb32f`` or ``rgb``. Known problems include Mesa/Intel not
-    accepting ``rgb16``, Mesa sometimes not being compiled with float texture
-    support, and some macOS setups being very slow with ``rgb16`` but fast
-    with ``rgb32f``. If you have problems, you can also try enabling the
-    ``--gpu-dumb-mode=yes`` option.
-
-``gpu-next``
-    Experimental video renderer based on ``libplacebo``. This supports almost
-    the same set of features as ``--vo=gpu``. See `GPU renderer options`_ for a
-    list.
-
-    Should generally be faster and higher quality, but some features may still
-    be missing or misbehave. Expect (and report!) bugs. See here for a list of
-    known differences and bugs:
-
-    https://github.com/mpv-player/mpv/wiki/GPU-Next-vs-GPU
-
 ``xv`` (X11 only)
    Uses the XVideo extension to enable hardware-accelerated display. This is
    the most compatible VO on X, but may be low-quality, and has issues with
@@ -112,16 +71,11 @@ Available video output drivers are:
    Shared memory video output driver without hardware acceleration that works
    whenever X11 is present.

-    Since mpv 0.30.0, you may need to use ``--profile=sw-fast`` to get decent
-    performance.
-
    .. note:: This is a fallback only, and should not be normally used.

 ``vdpau`` (X11 only)
    Uses the VDPAU interface to display and optionally also decode video.
-    Hardware decoding is used with ``--hwdec=vdpau``. Note that there is
-    absolutely no reason to use this, other than compatibility. We strongly
-    recommend that you use ``--vo=gpu`` with ``--hwdec=nvdec`` instead.
+    Hardware decoding is used with ``--hwdec=vdpau``.

    .. note::

@@ -142,6 +96,29 @@ Available video output drivers are:

        Apply a noise reduction algorithm to the video (default: 0; no noise
        reduction).
+    ``--vo-vdpau-deint=<-4-4>``
+        (Deprecated. See note about ``vdpaupp``.)
+
+        Select deinterlacing mode (default: 0). In older versions (as well as
+        MPlayer/mplayer2) you could use this option to enable deinterlacing.
+        This doesn't work anymore, and deinterlacing is enabled with either
+        the ``d`` key (by default mapped to the command ``cycle deinterlace``),
+        or the ``--deinterlace`` option. Also, to select the default deint mode,
+        you should use something like ``--vf-defaults=vdpaupp:deint-mode=temporal``
+        instead of this sub-option.
+
+        0
+            Pick the ``vdpaupp`` video filter default, which corresponds to 3.
+        1
+            Show only first field.
+        2
+            Bob deinterlacing.
+        3
+            Motion-adaptive temporal deinterlacing. May lead to A/V desync
+            with slow video hardware and/or high resolution.
+        4
+            Motion-adaptive temporal deinterlacing with edge-guided spatial
+            interpolation. Needs fast video hardware.
    ``--vo-vdpau-chroma-deint``
        (Deprecated. See note about ``vdpaupp``.)

@@ -224,8 +201,33 @@ Available video output drivers are:
    .. note:: This driver is for compatibility with systems that don't provide
              proper OpenGL drivers, and where ANGLE does not perform well.

+    .. note:: Before to 0.21.0, ``direct3d_shaders`` and ``direct3d`` were
+              different, with ``direct3d`` not using shader by default. Now
+              both use shaders by default, and ``direct3d_shaders`` is a
+              deprecated alias. Use the ``--vo-direct3d-prefer-stretchrect``
+              or the ``--vo-direct3d-disable-shaders`` options to get the old
+              behavior of ``direct3d``.
+
    The following global options are supported by this video output:

+    ``--vo-direct3d-prefer-stretchrect``
+        Use ``IDirect3DDevice9::StretchRect`` over other methods if possible.
+
+    ``--vo-direct3d-disable-stretchrect``
+        Never render the video using ``IDirect3DDevice9::StretchRect``.
+
+    ``--vo-direct3d-disable-textures``
+        Never render the video using D3D texture rendering. Rendering with
+        textures + shader will still be allowed. Add ``disable-shaders`` to
+        completely disable video rendering with textures.
+
+    ``--vo-direct3d-disable-shaders``
+        Never use shaders when rendering video.
+
+    ``--vo-direct3d-only-8bit``
+        Never render YUV video with more than 8 bits per component.
+        Using this flag will force software conversion to 8-bit.
+
    ``--vo-direct3d-disable-texture-align``
        Normally texture sizes are always aligned to 16. With this option
        enabled, the video texture will always have exactly the same size as
@@ -271,13 +273,42 @@ Available video output drivers are:
    ``--vo-direct3d-exact-backbuffer``
        Always resize the backbuffer to window size.

+``gpu``
+    General purpose, customizable, GPU-accelerated video output driver. It
+    supports extended scaling methods, dithering, color management, custom
+    shaders, HDR, and more.
+
+    See `GPU renderer options`_ for options specific to this VO.
+
+    By default, it tries to use fast and fail-safe settings. Use the
+    ``gpu-hq`` profile to use this driver with defaults set to high quality
+    rendering. The profile can be applied with ``--profile=gpu-hq`` and its
+    contents can be viewed with ``--show-profile=gpu-hq``.
+
+    This VO abstracts over several possible graphics APIs and windowing
+    contexts, which can be influenced using the ``--gpu-api`` and
+    ``--gpu-context`` options.
+
+    Hardware decoding over OpenGL-interop is supported to some degree. Note
+    that in this mode, some corner case might not be gracefully handled, and
+    color space conversion and chroma upsampling is generally in the hand of
+    the hardware decoder APIs.
+
+    ``gpu`` makes use of FBOs by default. Sometimes you can achieve better
+    quality or performance by changing the ``--gpu-fbo-format`` option to
+    ``rgb16f``, ``rgb32f`` or ``rgb``. Known problems include Mesa/Intel not
+    accepting ``rgb16``, Mesa sometimes not being compiled with float texture
+    support, and some OS X setups being very slow with ``rgb16`` but fast
+    with ``rgb32f``. If you have problems, you can also try enabling the
+    ``--gpu-dumb-mode=yes`` option.
+
 ``sdl``
    SDL 2.0+ Render video output driver, depending on system with or without
    hardware acceleration. Should work on all platforms supported by SDL 2.0.
    For tuning, refer to your copy of the file ``SDL_hints.h``.

    .. note:: This driver is for compatibility with systems that don't provide
-              proper graphics drivers.
+              proper graphics drivers, or which support GLES only.

    The following global options are supported by this video output:

@@ -287,23 +318,13 @@ Available video output drivers are:
    ``--sdl-switch-mode``
        Instruct SDL to switch the monitor video mode when going fullscreen.

-``dmabuf-wayland``
-    Experimental Wayland output driver designed for use with either drm stateless
-    or VA API hardware decoding. The driver is designed to avoid any GPU to CPU copies,
-    and to perform scaling and color space conversion using fixed-function hardware,
-    if available, rather than GPU shaders. This frees up GPU resources for other tasks.
-    It is highly recommended to use this VO with the appropriate ``--hwdec`` option such
-    as ``auto-safe``. It can still work in some circumstances without ``--hwdec`` due to
-    mpv's internal conversion filters, but this is not recommended as it's a needless
-    extra step. Correct output depends on support from your GPU, drivers, and compositor.
-    Weston and wlroots-based compositors like Sway and Intel GPUs are known to generally
-    work.
-
 ``vaapi``
    Intel VA API video output driver with support for hardware decoding. Note
    that there is absolutely no reason to use this, other than compatibility.
-    This is low quality, and has issues with OSD. We strongly recommend that
-    you use ``--vo=gpu`` with ``--hwdec=vaapi`` instead.
+    This is low quality, and has issues with OSD.
+
+    .. note:: This driver is for compatibility with crappy systems. You can
+              use vaapi hardware decoding with ``--vo=gpu`` too.

    The following global options are supported by this video output:

@@ -317,6 +338,25 @@ Available video output drivers are:
        nla
            ``non-linear anamorphic scaling``

+    ``--vo-vaapi-deint-mode=<mode>``
+        Select deinterlacing algorithm. Note that by default deinterlacing is
+        initially always off, and needs to be enabled with the ``d`` key
+        (default key binding for ``cycle deinterlace``).
+
+        This option doesn't apply if libva supports video post processing (vpp).
+        In this case, the default for ``deint-mode`` is ``no``, and enabling
+        deinterlacing via user interaction using the methods mentioned above
+        actually inserts the ``vavpp`` video filter. If vpp is not actually
+        supported with the libva backend in use, you can use this option to
+        forcibly enable VO based deinterlacing.
+
+        no
+            Don't allow deinterlacing (default for newer libva).
+        first-field
+            Show only first field.
+        bob
+            bob deinterlacing (default for older libva).
+
    ``--vo-vaapi-scaled-osd=<yes|no>``
        If enabled, then the OSD is rendered at video resolution and scaled to
        display resolution. By default, this is disabled, and the OSD is
@@ -340,16 +380,8 @@ Available video output drivers are:

 ``tct``
    Color Unicode art video output driver that works on a text console.
-    By default depends on support of true color by modern terminals to display
-    the images at full color range, but 256-colors output is also supported (see
-    below). On Windows it requires an ansi terminal such as mintty.
-
-    Since mpv 0.30.0, you may need to use ``--profile=sw-fast`` to get decent
-    performance.
-
-    Note: the TCT image output is not synchronized with other terminal output
-    from mpv, which can lead to broken images. The options ``--no-terminal`` or
-    ``--really-quiet`` can help with that.
+    Depends on support of true color by modern terminals to display the images
+    at full color range. On Windows it requires an ansi terminal such as mintty.

    ``--vo-tct-algo=<algo>``
        Select how to write the pixels to the terminal.
@@ -368,160 +400,6 @@ Available video output drivers are:
    ``--vo-tct-256=<yes|no>`` (default: no)
        Use 256 colors - for terminals which don't support true color.

-``kitty``
-    Graphical output for the terminal, using the kitty graphics protocol.
-    Tested with kitty and Konsole.
-
-    You may need to use ``--profile=sw-fast`` to get decent performance.
-
-    Kitty size and alignment options:
-
-    ``--vo-kitty-cols=<columns>``, ``--vo-kitty-rows=<rows>`` (default: 0)
-        Specify the terminal size in character cells, otherwise (0) read it
-        from the terminal, or fall back to 80x25.
-
-    ``--vo-kitty-width=<width>``, ``--vo-kitty-height=<height>`` (default: 0)
-        Specify the available size in pixels, otherwise (0) read it from the
-        terminal, or fall back to 320x240.
-
-    ``--vo-kitty-left=<col>``, ``--vo-kitty-top=<row>`` (default: 0)
-        Specify the position in character cells where the image starts (1 is
-        the first column or row). If 0 (default) then try to automatically
-        determine it according to the other values and the image aspect ratio
-        and zoom.
-
-    ``--vo-kitty-config-clear=<yes|no>`` (default: yes)
-        Whether or not to clear the terminal whenever the output is
-        reconfigured (e.g. when video size changes).
-
-    ``--vo-kitty-alt-screen=<yes|no>`` (default: yes)
-        Whether or not to use the alternate screen buffer and return the
-        terminal to its previous state on exit. When set to no, the last
-        kitty image stays on screen after quit, with the cursor following it.
-
-    ``--vo-kitty-use-shm=<yes|no>`` (default: no)
-        Use shared memory objects to transfer image data to the terminal.
-        This is much faster than sending the data as escape codes, but is not
-        supported by as many terminals. It also only works on the local machine
-        and not via e.g. SSH connections.
-
-        This option is not implemented on Windows.
-
-``sixel``
-    Graphical output for the terminal, using sixels. Tested with ``mlterm`` and
-    ``xterm``.
-
-    Note: the Sixel image output is not synchronized with other terminal
-    output from mpv, which can lead to broken images.
-    The option ``--really-quiet`` can help with that, and is recommended.
-    On some platforms, using the ``--vo-sixel-buffered`` option may work as
-    well.
-
-    You may need to use ``--profile=sw-fast`` to get decent performance.
-
-    Note: at the time of writing, ``xterm`` does not enable sixel by default -
-    launching it as ``xterm -ti 340`` is one way to enable it. Also, ``xterm``
-    does not display images bigger than 1000x1000 pixels by default.
-
-    To render and align sixel images correctly, mpv needs to know the terminal
-    size both in cells and in pixels. By default it tries to use values which
-    the terminal reports, however, due to differences between terminals this is
-    an error-prone process which cannot be automated with certainty - some
-    terminals report the size in pixels including the padding - e.g. ``xterm``,
-    while others report the actual usable number of pixels - like ``mlterm``.
-    Additionally, they may behave differently when maximized or in fullscreen,
-    and mpv cannot detect this state using standard methods.
-
-    Sixel size and alignment options:
-
-    ``--vo-sixel-cols=<columns>``, ``--vo-sixel-rows=<rows>`` (default: 0)
-        Specify the terminal size in character cells, otherwise (0) read it
-        from the terminal, or fall back to 80x25. Note that mpv doesn't use the
-        the last row with sixel because this seems to result in scrolling.
-
-    ``--vo-sixel-width=<width>``, ``--vo-sixel-height=<height>`` (default: 0)
-        Specify the available size in pixels, otherwise (0) read it from the
-        terminal, or fall back to 320x240. Other than excluding the last line,
-        the height is also further rounded down to a multiple of 6 (sixel unit
-        height) to avoid overflowing below the designated size.
-
-    ``--vo-sixel-left=<col>``, ``--vo-sixel-top=<row>`` (default: 0)
-        Specify the position in character cells where the image starts (1 is
-        the first column or row). If 0 (default) then try to automatically
-        determine it according to the other values and the image aspect ratio
-        and zoom.
-
-    ``--vo-sixel-pad-x=<pad_x>``, ``--vo-sixel-pad-y=<pad_y>`` (default: -1)
-        Used only when mpv reads the size in pixels from the terminal.
-        Specify the number of padding pixels (on one side) which are included
-        at the size which the terminal reports. If -1 (default) then the number
-        of pixels is rounded down to a multiple of number of cells (per axis),
-        to take into account padding at the report - this only works correctly
-        when the overall padding per axis is smaller than the number of cells.
-
-    ``--vo-sixel-config-clear=<yes|no>`` (default: yes)
-        Whether or not to clear the terminal whenever the output is
-        reconfigured (e.g. when video size changes).
-
-    ``--vo-sixel-alt-screen=<yes|no>`` (default: yes)
-        Whether or not to use the alternate screen buffer and return the
-        terminal to its previous state on exit. When set to no, the last
-        sixel image stays on screen after quit, with the cursor following it.
-
-        ``--vo-sixel-exit-clear`` is a deprecated alias for this option and
-        may be removed in the future.
-
-    ``--vo-sixel-buffered=<yes|no>`` (default: no)
-        Buffers the full output sequence before writing it to the terminal.
-        On POSIX platforms, this can help prevent interruption (including from
-        other applications) and thus broken images, but may come at a
-        performance cost with some terminals and is subject to implementation
-        details.
-
-    Sixel image quality options:
-
-    ``--vo-sixel-dither=<algo>``
-        Selects the dither algorithm which libsixel should apply.
-        Can be one of the below list as per libsixel's documentation.
-
-        auto (Default)
-            Let libsixel choose the dithering method.
-        none
-            Don't diffuse
-        atkinson
-            Diffuse with Bill Atkinson's method.
-        fs
-            Diffuse with Floyd-Steinberg method
-        jajuni
-            Diffuse with Jarvis, Judice & Ninke method
-        stucki
-            Diffuse with Stucki's method
-        burkes
-            Diffuse with Burkes' method
-        arithmetic
-            Positionally stable arithmetic dither
-        xor
-            Positionally stable arithmetic xor based dither
-
-    ``--vo-sixel-fixedpalette=<yes|no>`` (default: yes)
-        Use libsixel's built-in static palette using the XTERM256 profile
-        for dither. Fixed palette uses 256 colors for dithering. Note that
-        using ``no`` (at the time of writing) will slow down ``xterm``.
-
-    ``--vo-sixel-reqcolors=<colors>`` (default: 256)
-        Has no effect with fixed palette. Set up libsixel to use required
-        number of colors for dynamic palette. This value depends on the
-        terminal emulator as well. Xterm supports 256 colors. Can set this to
-        a lower value for faster performance.
-
-    ``--vo-sixel-threshold=<threshold>`` (default: -1)
-        Has no effect with fixed palette. Defines the threshold to change the
-        palette - as percentage of the number of colors, e.g. 20 will change
-        the palette when the number of colors changed by 20%. It's a simple
-        measure to reduce the number of palette changes, because it can be slow
-        in some terminals (``xterm``). The default (-1) will choose a palette
-        on every frame and will have better quality.
-
 ``image``
    Output each frame into an image file in the current directory. Each file
    takes the frame number padded with leading zeros as name.
@@ -537,8 +415,6 @@ Available video output drivers are:
            JPEG files, extension .jpeg.
        png
            PNG files.
-        webp
-            WebP files.

    ``--vo-image-png-compression=<0-9>``
        PNG compression factor (speed vs. file size tradeoff) (default: 7)
@@ -549,17 +425,11 @@ Available video output drivers are:
        JPEG quality factor (default: 90)
    ``--vo-image-jpeg-optimize=<0-100>``
        JPEG optimization factor (default: 100)
-    ``--vo-image-webp-lossless=<yes|no>``
-        Enable writing lossless WebP files (default: no)
-    ``--vo-image-webp-quality=<0-100>``
-        WebP quality (default: 75)
-    ``--vo-image-webp-compression=<0-6>``
-        WebP compression factor (default: 4)
    ``--vo-image-outdir=<dirname>``
        Specify the directory to save the image files to (default: ``./``).

 ``libmpv``
-    For use with libmpv direct embedding. As a special case, on macOS it
+    For use with libmpv direct embedding. As a special case, on OS X it
    is used like a normal VO within mpv (cocoa-cb). Otherwise useless in any
    other contexts.
    (See ``<mpv/render.h>``.)
@@ -570,7 +440,14 @@ Available video output drivers are:
 ``rpi`` (Raspberry Pi)
    Native video output on the Raspberry Pi using the MMAL API.

-    The following global options are supported by this video output:
+    This is deprecated. Use ``--vo=gpu`` instead, which is the default and
+    provides the same functionality. The ``rpi`` VO will be removed in
+    mpv 0.23.0. Its functionality was folded into --vo=gpu, 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).
+
+    The following deprecated global options are supported by this video output:

    ``--rpi-display=<number>``
        Select the display number on which the video overlay should be shown
@@ -597,59 +474,33 @@ Available video output drivers are:
    environment (e.g. no X). Does not support hardware acceleration (if you
    need this, check the ``drm`` backend for ``gpu`` VO).

-    Since mpv 0.30.0, you may need to use ``--profile=sw-fast`` to get decent
-    performance.
-
    The following global options are supported by this video output:

-    ``--drm-connector=<name>``
+    ``--drm-connector=[<gpu_number>.]<name>``
        Select the connector to use (usually this is a monitor.) If ``<name>``
        is empty or ``auto``, mpv renders the output on the first available
-        connector. Use ``--drm-connector=help`` to get a list of available
-        connectors. (default: empty)
+        connector. Use ``--drm-connector=help`` to get list of available
+        connectors. When using multiple graphic cards, use the ``<gpu_number>``
+        argument to disambiguate.
+        (default: empty)

-    ``--drm-device=<path>``
-        Select the DRM device file to use. If specified this overrides automatic
-        card selection. (default: empty)
+    ``--drm-mode=<number>``
+        Mode ID to use (resolution and frame rate).
+        (default: 0)

-    ``--drm-mode=<preferred|highest|N|WxH[@R]>``
-        Mode to use (resolution and frame rate).
-        Possible values:
+    ``--drm-osd-plane-id=<number>``
+        Select the DRM plane index to use for OSD (or OSD and video).
+        Index is zero based, and related to crtc.
+        When using this option with the drm_prime renderer, it will only affect
+        the OSD contents. Otherwise it will set OSD & video plane.
+        (default: primary plane)

-        :preferred: Use the preferred mode for the screen on the selected
-                    connector. (default)
-        :highest:   Use the mode with the highest resolution available on the
-                    selected connector.
-        :N:         Select mode by index.
-        :WxH[@R]:   Specify mode by width, height, and optionally refresh rate.
-                    In case several modes match, selects the mode that comes
-                    first in the EDID list of modes.
-
-        Use ``--drm-mode=help`` to get a list of available modes for all active
-        connectors.
-
-    ``--drm-draw-plane=<primary|overlay|N>``
-        Select the DRM plane to which video and OSD is drawn to, under normal
-        circumstances. The plane can be specified as ``primary``, which will
-        pick the first applicable primary plane; ``overlay``, which will pick
-        the first applicable overlay plane; or by index. The index is zero
-        based, and related to the CRTC.
-        (default: primary)
-
-        When using this option with the drmprime-overlay hwdec interop, only the
-        OSD is rendered to this plane.
-
-    ``--drm-drmprime-video-plane=<primary|overlay|N>``
-        Select the DRM plane to use for video with the drmprime-overlay hwdec
-        interop (used by e.g. the rkmpp hwdec on RockChip SoCs, and v4l2 hwdec:s
-        on various other SoC:s). The plane is unused otherwise. This option
-        accepts the same values as ``--drm-draw-plane``. (default: overlay)
-
-        To be able to successfully play 4K video on various SoCs you might need
-        to set ``--drm-draw-plane=overlay --drm-drmprime-video-plane=primary``
-        and setting ``--drm-draw-surface-size=1920x1080``, to render the OSD at a
-        lower resolution (the video when handled by the hwdec will be on the
-        drmprime-video plane and at full 4K resolution)
+    ``--drm-video-plane-id=<number>``
+        Select the DRM plane index to use for video layer.
+        Index is zero based, and related to crtc.
+        This option only has effect when using the drm_prime renderer (which
+        supports several layers) together with ``vo=gpu`` and ``gpu-context=drm``.
+        (default: first overlay plane)

    ``--drm-format=<xrgb8888|xrgb2101010>``
        Select the DRM format to use (default: xrgb8888). This allows you to
@@ -658,36 +509,19 @@ Available video output drivers are:
        xrgb2101010 is a packed 30 bits per pixel/10 bits per channel packed RGB
        format with 2 bits of padding.

-        There are cases when xrgb2101010 will work with the ``drm`` VO, but not
-        with the ``drm`` backend for the ``gpu`` VO. This is because with the
-        ``gpu`` VO, in addition to requiring support in your DRM driver,
-        requires support for xrgb2101010 in your EGL driver
+        Unless you have an intel graphics card, a recent kernel and a recent
+        version of mesa (>=18) xrgb2101010 is unlikely to work for you.

-    ``--drm-draw-surface-size=<[WxH]>``
-        Sets the size of the surface used on the draw plane. The surface will
-        then be upscaled to the current screen resolution. This option can be
-        useful when used together with the drmprime-overlay hwdec interop at
-        high resolutions, as it allows scaling the draw plane (which in this
-        case only handles the OSD) down to a size the GPU can handle.
-
-        When used without the drmprime-overlay hwdec interop this option will
-        just cause the video to get rendered at a different resolution and then
-        scaled to screen size.
+        This currently only has an effect when used together with the ``drm``
+        backend for the ``gpu`` VO. The ``drm`` VO always uses xrgb8888.

+    ``--drm-osd-size=<[WxH]>``
+        Sets the OSD OpenGL size to the specified size. OSD will then be upscaled
+        to the current screen resolution. This option can be useful when using
+        several layers in high resolutions with a GPU which cannot handle it.
+        Note : this option is only available with DRM atomic support.
        (default: display resolution)

-    ``--drm-vrr-enabled=<no|yes|auto>``
-        Toggle use of Variable Refresh Rate (VRR), aka Freesync or Adaptive Sync
-        on compatible systems. VRR allows for the display to be refreshed at any
-        rate within a range (usually ~40Hz-60Hz for 60Hz displays). This can help
-        with playback of 24/25/50fps content. Support depends on the use of a
-        compatible monitor, GPU, and a sufficiently new kernel with drivers
-        that support the feature.
-
-        :no:    Do not attempt to enable VRR. (default)
-        :yes:   Attempt to enable VRR, whether the capability is reported or not.
-        :auto:  Attempt to enable VRR if support is reported.
-
 ``mediacodec_embed`` (Android)
    Renders ``IMGFMT_MEDIACODEC`` frames directly to an ``android.view.Surface``.
    Requires ``--hwdec=mediacodec`` for hardware decoding, along with
@@ -697,14 +531,5 @@ Available video output drivers are:
    many of mpv's features (subtitle rendering, OSD/OSC, video filters, etc)
    are not available with this driver.

-    To use hardware decoding with ``--vo=gpu`` instead, use ``--hwdec=mediacodec``
-    or ``mediacodec-copy`` along with ``--gpu-context=android``.
-
-``wlshm`` (Wayland only)
-    Shared memory video output driver without hardware acceleration that works
-    whenever Wayland is present.
-
-    Since mpv 0.30.0, you may need to use ``--profile=sw-fast`` to get decent
-    performance.
-
-    .. note:: This is a fallback only, and should not be normally used.
+    To use hardware decoding with ``--vo-gpu`` instead, use
+    ``--hwdec=mediacodec-copy`` along with ``--gpu-context=android``.
@@ -52,7 +52,7 @@ Input
 * 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: https://github.com/mpv-player/mpv/wiki/IR-remotes
+  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.
@@ -144,6 +144,7 @@ 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.
@@ -214,7 +215,7 @@ Command Line Switches
    ``-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-override``
+    ``-aspect``                 ``--video-aspect``
    ``-ass-bottom-margin``      ``--vf=sub=bottom:top``
    ``-ass``                    ``--sub-ass``
    ``-audiofile-cache``        (removed; the main cache settings are used)
@@ -229,7 +230,7 @@ Command Line Switches
    ``-endpos``                 ``--length``
    ``-fixed-vo``               (removed; always the default)
    ``-font``                   ``--osd-font``
-    ``-forcedsubsonly``         ``--sub-forced-events-only``
+    ``-forcedsubsonly``         ``--sub-forced-only``
    ``-forceidx``               ``--index``
    ``-format``                 ``--audio-format``
    ``-fsmode-dontuse``         (removed)
@@ -247,7 +248,7 @@ Command Line Switches
    ``-msglevel``               ``--msg-level`` (changed semantics)
    ``-msgmodule``              ``--msg-module``
    ``-name``                   ``--x11-name``
-    ``-noar``                   ``(removed; replaced by MediaPlayer framework)``
+    ``-noar``                   ``--no-input-appleremote``
    ``-noautosub``              ``--no-sub-auto``
    ``-noconsolecontrols``      ``--no-input-terminal``
    ``-nosound``                ``--no-audio``
@@ -321,9 +322,9 @@ input.conf and Slave Commands
    +--------------------------------+----------------------------------------+
    | ``pt_step -1 [0|1]``           | ``playlist-prev [weak|force] (same)``  |
    +--------------------------------+----------------------------------------+
-    | ``switch_ratio [<ratio>]``     | ``set video-aspect-override <ratio>``  |
+    | ``switch_ratio [<ratio>]``     | ``set video-aspect <ratio>``           |
    |                                |                                        |
-    |                                | ``set video-aspect-override 0`` (reset)|
+    |                                | ``set video-aspect 0`` (reset aspect)  |
    +--------------------------------+----------------------------------------+
    | ``step_property_osd <prop>``   | ``cycle <prop> <step>`` (wraps),       |
    | ``<step> <dir>``               | ``add <prop> <step>`` (clamps).        |
@@ -1,15 +1,13 @@
 Release Policy
 ==============

-Once or twice a year, a new release is cut off of the master branch and is
+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.

 Releases are tagged on the master branch and will not be maintained separately.
-Patch releases may be made if the amount or severity of bugs justify it, or in
-the event of security issues.

 The goal of releases is to provide Linux distributions with something to
 package. If you want the newest features, just use the master branch.
@@ -22,42 +20,33 @@ Release procedure

 While on master:

- Update the `RELEASE_NOTES` file, replacing the previous release notes.
+- Update the `RELEASE_NOTES` file.

 - 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 signed commit with changes.
+- Commit changes.

 - Create signed tag v0.X.Y.

- Push release branch (`release/0.X`) and tag to GitHub.
+- 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.

- Readd -UNKNOWN suffix to version in `VERSION` file.
-
-If necessary (to e.g. exclude commits already on master), the release can
-be done on a branch with different commit history. The release branch **must**
-then be merged to master so `git describe` will pick up the tag.
-
-This does not apply to patch releases, which are tagged directly on the
-`release/0.X` branch. The master branch always remains at v0.X.0.
-
 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
 =============

-This release requires FFmpeg <ver> or newer.
-
 Features
 --------

@@ -66,18 +55,20 @@ New

 - List of new features

-
-Changed
-~~~~~~~
-
- List of changed features
-
-
 Removed
 ~~~~~~~

 - List of removed features

+Deprecated
+~~~~~~~~~~
+
+- List of deprecated features
+
+Behavior
+--------
+
+- List of user-visible changes in behavior

 Options and Commands
 --------------------
@@ -87,52 +78,40 @@ 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

-
-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 <start>..<end>`
-in the git repository.
+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
+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.
-
-The changelog of lists all changes since the last release, including those
-that have been backported to patch releases already.
-
-Some additional advice:
- Especially for features, try to reword the messages so that the user-visible
-  change is clear to the reader. But don't simplify too much or be too verbose.
- It often makes sense to merge multiple related changes into one line
- Changes that have been made and reverted within the same release must not
-  appear in the changelog
- Limit the "Options and Commands" section to relevant changes
- When filling in the GitHub release, remove the "Release 0.X.Y" heading
@@ -15,7 +15,7 @@ player/*.c:
        * parse command line, add files from the command line to playlist
          (m_config_parse_mp_command_line())
        * check help options etc. (call handle_help_options()), possibly exit
-        * call mp_play_files() function that works down the playlist:
+        * 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)
            * actually load and play a file in play_current_file():
@@ -30,7 +30,7 @@ player/*.c:
            * determine next entry on the playlist to play
            * loop, or exit if no next file or quit is requested
              (see enum stop_play_reason)
-        * call mp_destroy()
+        * call exit_player_with_rc()
    * run_playloop():
        * calls fill_audio_out_buffers()
            This checks whether new audio needs to be decoded, and pushes it
@@ -44,9 +44,9 @@ player/*.c:

    Things worth saying about the playback core:
    - most state is in MPContext (core.h), which is not available to the
-      subsystems (and should not be made available)
+      subsystems
    - the currently played tracks are in mpctx->current_tracks, and decoder
-      state in track.dec/d_sub
+      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
@@ -68,7 +68,6 @@ ta.h & ta.c:
    as in it doesn't require valgrind.) You can enable it by setting the
    MPV_LEAK_REPORT environment variable to "1":
        export MPV_LEAK_REPORT=1
-    Or permanently by building with --enable-ta-leak-report.
    This will list all unfree'd allocations on exit.

    Documentation can be found here:
@@ -104,45 +103,13 @@ 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, but is being incrementally broken
-    up into sub-structs. Many components have their own sub-option structs
-    separate from MPOpts. New options should be bound to the component that uses
-    them. Add a new option table/struct if needed.
-
-    The global MPOpts still contains the sub-structs as fields, which serves to
-    link them to the option parser. For example, an entry like this may be
-    typical:
-
-        {"", OPT_SUBSTRUCT(demux_opts, demux_conf)},
-
-    This directs the option access code to include all options in demux_conf
-    into the global option list, with no prefix (""), and as part of the
-    MPOpts.demux_opts field. The MPOpts.demux_opts field is actually not
-    accessed anywhere, and instead demux.c does this:
-
-        struct m_config_cache *opts_cache =
-            m_config_cache_alloc(demuxer, global, &demux_conf);
-        struct demux_opts *opts = opts_cache->opts;
-
-    ... to get a copy of its options.
-
-    See m_config.h (below) how to access options.
+    MPOpts is unfortunately 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.

-options/m_config.h & m_config.c:
-    Code for querying and managing options. This (unfortunately) contains both
-    declarations for the "legacy-ish" global m_config struct, and ways to access
-    options in a threads-safe way anywhere, like m_config_cache_alloc().
-
-    m_config_cache_alloc() lets anyone read, observe, and write options in any
-    thread. The only state it needs is struct mpv_global, which is an opaque
-    type that can be passed "down" the component hierarchy. For safety reasons,
-    you should not pass down any pointers to option structs (like MPOpts), but
-    instead pass down mpv_global, and use m_config_cache_alloc() (or similar)
-    to get a synchronized copy of the options.
-
 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
@@ -172,6 +139,9 @@ stream/*:
    Some stream inputs are just there to invoke special demuxers, like
    stream_mf.c. (Basically to make the prefix "mf://" do something special.)

+    cache.c is a caching wrapper around streams implementations, needed for
+    smooth network playback.
+
 demux/:
    Demuxers split data streams into audio/video/sub streams, which in turn
    are split in packets. Packets (see demux_packet.h) are mostly byte chunks
@@ -185,10 +155,6 @@ demux/:
    There is a stream header for each audio/video/sub stream, and each of them
    holds codec information about the stream and other information.

-    demux.c is a bit big, the main reason being that it contains the demuxer
-    cache, which is implemented as a list of packets. The cache is complex
-    because it support seeking, multiple ranges, prefetching, and so on.
-
 video/:
    This contains several things related to audio/video decoding, as well as
    video filters.
@@ -274,383 +240,3 @@ sub/:
 etc/:
    The file input.conf is actually integrated into the mpv binary by the
    build system. It contains the default keybindings.
-
-Best practices and Concepts within mpv
-======================================
-
-General contribution etc.
-------------------------
-
-See: DOCS/contribute.md
-
-Error checking
--------------
-
-If an error is relevant, it should be handled. If it's interesting, log the
-error. However, mpv often keeps errors silent and reports failures somewhat
-coarsely by propagating them upwards the caller chain. This is OK, as long as
-the errors are not very interesting, or would require a developer to debug it
-anyway (in which case using a debugger would be more convenient, and the
-developer would need to add temporary debug printfs to get extremely detailed
-information which would not be appropriate during normal operation).
-
-Basically, keep a balance on error reporting. But always check them, unless you
-have a good argument not to.
-
-Memory allocation errors (OOM) are a special class of errors. Normally such
-allocation failures are not handled "properly". Instead, abort() is called.
-(New code should use MP_HANDLE_OOM() for this.) This is done out of laziness and
-for convenience, and due to the fact that MPlayer/mplayer2 never handled it
-correctly. (MPlayer varied between handling it correctly, trying to do so but
-failing, and just not caring, while mplayer2 started using abort() for it.)
-
-This is justifiable in a number of ways. Error handling paths are notoriously
-untested and buggy, so merely having them won't make your program more reliable.
-Having these error handling paths also complicates non-error code, due to the
-need to roll back state at any point after a memory allocation.
-
-Take any larger body of code, that is supposed to handle OOM, and test whether
-the error paths actually work, for example by overriding malloc with a version
-that randomly fails. You will find bugs quickly, and often they will be very
-annoying to fix (if you can even reproduce them).
-
-In addition, a clear indication that something went wrong may be missing. On
-error your program may exhibit "degraded" behavior by design. Consider a video
-encoder dropping frames somewhere in the middle of a video due to temporary
-allocation failures, instead of just exiting with an errors. In other cases, it
-may open conceptual security holes. Failing fast may be better.
-
-mpv uses GPU APIs, which may be break on allocation errors (because driver
-authors will have the same issues as described here), or don't even have a real
-concept for dealing with OOM (OpenGL).
-
-libmpv is often used by GUIs, which I predict always break if OOM happens.
-
-Last but not least, OSes like Linux use "overcommit", which basically means that
-your program may crash any time OOM happens, even if it doesn't use malloc() at
-all!
-
-But still, don't just assume malloc() always succeeds. Use MP_HANDLE_OOM(). The
-ta* APIs do this for you. The reason for this is that dereferencing a NULL
-pointer can have security relevant consequences if large offsets are involved.
-Also, a clear error message is better than a random segfault.
-
-Some big memory allocations are checked anyway. For example, all code must
-assume that allocating video frames or packets can fail. (The above example
-of dropping video frames during encoding is entirely possible in mpv.)
-
-Undefined behavior
------------------
-
-Undefined behavior (UB) is a concept in the C language. C is famous for being a
-language that makes it almost impossible to write working code, because
-undefined behavior is so easily triggered, compilers will happily abuse it to
-generate "faster" code, debugging tools will shout at you, and sometimes it
-even means your code doesn't work.
-
-There is a lot of literature on this topic. Read it.
-
-(In C's defense, UB exists in other languages too, but since they're not used
-for low level infrastructure, and/or these languages are at times not rigorously
-defined, simply nobody cares. However, the C standard committee is still guilty
-for not addressing this. I'll admit that I can't even tell from the standard's
-gibberish whether some specific behavior is UB or not. It's written like tax
-law.)
-
-In mpv, we generally try to avoid undefined behavior. For one, we want portable
-and reliable operation. But more importantly, we want clean output from
-debugging tools, in order to find real bugs more quickly and effectively.
-
-Avoid the "works in practice" argument. Once debugging tools come into play, or
-simply when "in practice" stops being true, this will all get back to you in a
-bad way.
-
-Global state, library safety
----------------------------
-
-Mutable global state is when code uses global variables that are not read-only.
-This must be avoided in mpv. Always use context structs that the caller of
-your code needs to allocate, and whose pointers are passed to your functions.
-
-Library safety means that your code (or library) can be used by a library
-without causing conflicts with other library users in the same process. To any
-piece of code, a "safe" library's API can simply be used, without having to
-worry about other API users that may be around somewhere.
-
-Libraries are often not library safe, because they use global mutable state
-or other "global" resources. Typical examples include use of signals, simple
-global variables (like hsearch() in libc), or internal caches not protected by
-locks.
-
-A surprisingly high number of libraries are not library safe because they need
-global initialization. Typically they provide an API function, which
-"initializes" the library, and which must be called before calling any other
-API functions. Often, you are to provide global configuration parameters, which
-can change the behavior of the library. If two libraries A and B use library C,
-but A and B initialize C with different parameters, something "bad" may happen.
-In addition, these global initialization functions are often not thread-safe. So
-if A and B try to initialize C at the same time (from different threads and
-without knowing about each other), it may cause undefined behavior. (libcurl is
-a good example of both of these issues. FFmpeg and some TLS libraries used to be
-affected, but improved.)
-
-This is so bad because library A and B from the previous example most likely
-have no way to cooperate, because they're from different authors and have no
-business knowing each others. They'd need a library D, which wraps library C
-in a safe way. Unfortunately, typically something worse happens: libraries get
-"infected" by the unsafeness of its sub-libraries, and export a global init API
-just to initialize the sub-libraries. In the previous example, libraries A and B
-would export global init APIs just to init library C, even though the rest of
-A/B are clean and library safe. (Again, libcurl is an example of this, if you
-subtract other historic anti-features.)
-
-The main problem with library safety is that its lack propagates to all
-libraries using the library.
-
-We require libmpv to be library safe. This is not really possible, because some
-libraries are not library safe (FFmpeg, Xlib, partially ALSA). However, for
-ideological reasons, there is no global init API, and best effort is made to try
-to avoid problems.
-
-libmpv has some features that are not library safe, but which are disabled by
-default (such as terminal usage aka stdout, or JSON IPC blocking SIGPIPE for
-internal convenience).
-
-A notable, very disgustingly library unsafe behavior of libmpv is calling
-abort() on some memory allocation failure. See error checking section.
-
-Logging
-------
-
-All logging and terminal output in mpv goes through the functions and macros
-provided in common/msg.h. This is in part for library safety, and in part to
-make sure users can silence all output, or to redirect the output elsewhere,
-like a log file or the internal console.lua script.
-
-Locking
-------
-
-See generally available literature. In mpv, we use mp_thread for this.
-
-Always keep locking clean. Don't skip locking just because it will work "in
-practice". (See undefined behavior section.) If your use case is simple, you may
-use C11 atomics, but most likely you will only hurt yourself and others.
-
-Always make clear which fields in a struct are protected by which lock. If a
-field is immutable, or simply not thread-safe (e.g. state for a single worker
-thread), document it as well.
-
-Internal mpv APIs are assumed to be not thread-safe by default. If they have
-special guarantees (such as being usable by more than one thread at a time),
-these should be explicitly documented.
-
-All internal mpv APIs must be free of global state. Even if a component is not
-thread-safe, multiple threads can use _different_ instances of it without any
-locking.
-
-On a side note, recursive locks may seem convenient at first, but introduce
-additional problems with condition variables and locking hierarchies. They
-should be avoided.
-
-Locking hierarchy
-----------------
-
-A simple way to avoid deadlocks with classic locking is to define a locking
-hierarchy or lock order. If all threads acquire locks in the same order, no
-deadlocks will happen.
-
-For example, a "leaf" lock is a lock that is below all other locks in the
-hierarchy. You can acquire it any time, as long as you don't acquire other
-locks while holding it.
-
-Unfortunately, C has no way to declare or check the lock order, so you should at
-least document it.
-
-In addition, try to avoid exposing locks to the outside. Making the declaration
-of a lock private to a specific .c file (and _not_ exporting accessors or
-lock/unlock functions that manipulate the lock) is a good idea. Your component's
-API may acquire internal locks, but should release them when returning. Keeping
-the entire locking in a single file makes it easy to check it.
-
-Avoiding callback hell
----------------------
-
-mpv code is separated in components, like the "frontend" (i.e. MPContext mpctx),
-VOs, AOs, demuxers, and more. The frontend usually calls "down" the usage
-hierarchy: mpctx almost on top, then things like vo/ao, and utility code on the
-very bottom.
-
-"Callback hell" is when components call both up and down the hierarchy,
-which for example leads to accidentally recursion, reentrancy problems, or
-locking nightmares. This is avoided by (mostly) calling only down the hierarchy.
-Basically the call graph forms a DAG. The other direction is handled by event
-queues, wakeup callbacks, and similar mechanisms.
-
-Typically, a component provides an API, and does not know anything about its
-user. The API user (component higher in the hierarchy) polls the state of the
-lower component when needed.
-
-This also enforces some level of modularization, and with some luck the locking
-hierarchy. (Basically, locks of lower components automatically become leaf
-locks.) Another positive effect is simpler memory management.
-
-(Also see e.g.: http://250bpm.com/blog:24)
-
-Wakeup callbacks
----------------
-
-This is a common concept in mpv. Even the public API uses it. It's used when an
-API has internal threads (or otherwise triggers asynchronous events), but the
-component call hierarchy needs to be kept. The wakeup callback is the only
-exception to the call hierarchy, and always calls up.
-
-For example, vo spawns a thread that the API user (the mpv frontend) does not
-need to know about. vo simply provides a single-threaded API (or that looks like
-one). This API needs a way to notify the API user of new events. But the vo
-event producer is on the vo thread - it can't simply invoke a callback back into
-the API user, because then the API user has to deal with locking, despite not
-using threads. In addition, this will probably cause problems like mentioned in
-the "callback hell" section, especially lock order issues.
-
-The solution is the wakeup callback. It merely unblocks the API user from
-waiting, and the API user then uses the normal vo API to examine whether or
-which state changed. As a concept, it documents what a wakeup callback is
-allowed to do and what not, to avoid the aforementioned problems.
-
-Generally, you are not allowed to call any API from the wakeup callback. You
-just do whatever is needed to unblock your thread. For example, if it's waiting
-on a mutex/condition variable, acquire the mutex, set a change flag, signal
-the condition variable, unlock, return. (This mutex must not be held when
-calling the API. It must be a leaf lock.)
-
-Restricting the wakeup callback like this sidesteps any reentrancy issues and
-other complexities. The API implementation can simply hold internal (and
-non-recursive) locks while invoking the wakeup callback.
-
-The API user still needs to deal with locking (probably), but there's only the
-need to implement a single "receiver", that can handle the entire API of the
-used component. (Or multiple APIs - MPContext for example has only 1 wakeup
-callback that handles all AOs, VOs, input, demuxers, and more. It simple re-runs
-the playloop.)
-
-You could get something more advanced by turning this into a message queue. The
-API would append a message to the queue, and the API user can read it. But then
-you still need a way to "wakeup" the API user (unless you force the API user
-to block on your API, which will make things inconvenient for the API user). You
-also need to worry about what happens if the message queue overruns (you either
-lose messages or have unbounded memory usage). In the mpv public API, the
-distinction between message queue and wakeup callback is sort of blurry, because
-it does provide a message queue, but an additional wakeup callback, so API
-users are not required to call mpv_wait_event() with a high timeout.
-
-mpv itself prefers using wakeup callbacks over a generic event queue, because
-most times an event queue is not needed (or complicates things), and it is
-better to do it manually.
-
-(You could still abstract the API user side of wakeup callback handling, and
-avoid reimplementing it all the time. Although mp_dispatch_queue already
-provides mechanisms for this.)
-
-Condition variables
-------------------
-
-They're used whenever a thread needs to wait for something, without nonsense
-like sleep calls or busy waiting. mpv uses the mp_thread API for this.
-There's a lot of literature on condition variables, threading in general. Read it.
-
-For initial understanding, it may be helpful to know that condition variables
-are not variables that signal a condition. mp_cond does not have any
-state per-se. Maybe mp_cond would better be named mp_interrupt,
-because its sole purpose is to interrupt a thread waiting via mp_cond_wait()
-(or similar). The "something" in "waiting for something" can be called
-predicate (to avoid confusing it with "condition"). Consult literature for the
-proper terms.
-
-The very short version is...
-
-Shared declarations:
-
-    mp_mutex lock;
-    mp_cond cond_var;
-    struct something state_var; // protected by lock, changes signaled by cond_var
-
-Waiter thread:
-
-    mp_mutex_lock(&lock);
-
-    // Wait for a change in state_var. We want to wait until predicate_fulfilled()
-    // returns true.
-    // Must be a loop for 2 reasons:
-    //  1. cond_var may be associated with other conditions too
-    //  2. mp_cond_wait() can have sporadic wakeups
-    while (!predicate_fulfilled(&state_var)) {
-        // This unlocks, waits for cond_var to be signaled, and then locks again.
-        // The _whole_ point of cond_var is that unlocking and waiting for the
-        // signal happens atomically.
-        mp_cond_wait(&cond_var, &lock);
-    }
-
-    // Here you may react to the state change. The state cannot change
-    // asynchronously as long as you still hold the lock (and didn't release
-    // and reacquire it).
-    // ...
-
-    mp_mutex_unlock(&lock);
-
-Signaler thread:
-
-    mp_mutex_lock(&lock);
-
-    // Something changed. Update the shared variable with the new state.
-    update_state(&state_var);
-
-    // Notify that something changed. This will wake up the waiter thread if
-    // it's blocked in mp_cond_wait(). If not, nothing happens.
-    mp_cond_broadcast(&cond_var);
-
-    // Fun fact: good implementations wake up the waiter only when the lock is
-    // released, to reduce kernel scheduling overhead.
-    mp_mutex_unlock(&lock);
-
-Some basic rules:
-    1. Always access your state under proper locking
-    2. Always check your predicate before every call to mp_cond_wait()
-       (And don't call mp_cond_wait() if the predicate is fulfilled.)
-    3. Always call mp_cond_wait() in a loop
-       (And only if your predicate failed without releasing the lock..)
-    4. Always call mp_cond_broadcast()/_signal() inside of its associated
-       lock
-
-mpv sometimes violates rule 3, and leaves "retrying" (i.e. looping) to the
-caller.
-
-Common pitfalls:
-    - Thinking that mp_cond is some kind of semaphore, or holds any
-       application state or the user predicate (it _only_ wakes up threads
-       that are at the same time blocking on mp_cond_wait() and friends,
-       nothing else)
-    - Changing the predicate, but not updating all mp_cond_broadcast()/
-      _signal() calls correctly
-    - Forgetting that mp_cond_wait() unlocks the lock (other threads can
-      and must acquire the lock)
-    - Holding multiple nested locks while trying to wait (=> deadlock, violates
-      the lock order anyway)
-    - Waiting for a predicate correctly, but unlocking/relocking before acting
-      on it (unlocking allows arbitrary state changes)
-    - Confusing which lock/condition var. is used to manage a bit of state
-
-Generally available literature probably has better examples and explanations.
-
-Using condition variables the proper way is generally preferred over using more
-messy variants of them. (Just saying because on win32, "SetEvent" exists, and
-it's inferior to condition variables. Try to avoid the win32 primitives, even if
-you're dealing with Windows-only code.)
-
-Threads
-------
-
-Threading should be conservatively used. Normally, mpv code pretends to be
-single-threaded, and provides thread-unsafe APIs. Threads are used coarsely,
-and if you can avoid messing with threads, you should. For example, VOs and AOs
-do not need to deal with threads normally, even though they run on separate
-threads. The glue code "isolates" them from any threading issues.
@@ -0,0 +1,157 @@
+waf build system overview
+=========================
+
+mpv's new build system is based on waf and it should completely replace the
+custom ./configure + Makefile based system inherited from MPlayer.
+
+Goals and the choice of waf
+===========================
+
+The new system comes with some goals, which can be summed up as: be as good as
+the old one at what it did well (customizability) and fix some of it's major
+shortcomings:
+
+1) The build system must be uniform in how it handles any single feature check.
+   Repetition and boilerplate have to be avoided.
+
+   When adding a new feature using the old configure, one had to add a fair
+   amount of code to the shell script to do option parsing, detection of the
+   feature and declaration of variables for the Makefile to pickup. The worst
+   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.
+
+3) Must be customizable, hackable, pleasant to the developer eyes and to work
+   with in general.
+
+4) Must have separate configuration and build steps.
+
+Goal 2 comes as a given on pretty much any build system, since autotools made
+this behaviour very popular among users (and rightly so).
+
+Goal 1+3 were somewhat harder to accomplish as it looks like all of the build
+systems we evaluated (waf included!) had problems with them. For reference we
+had proof of concept build systems with waf, CMake and autotools.
+
+What puts waf apart from CMake and autotools, is that projects using it use
+Python to program their build system. Also while the Waf Book shows really
+simple API usages, you can write your own build system on top of waf that is
+tailored to the project's specific needs.
+
+mpv's custom configure step on top of waf
+=========================================
+
+To some extents mpv has a custom build system written on top of waf. This
+document will not go over the standard waf behaviour as that is documented in
+the `Waf book <http://docs.waf.googlecode.com/git/book_17/single.html>`_.
+
+All of the configuration process is handled with a declarative approach. Lists
+of dictionaries define the checks, and some custom Python code traverses these
+lists and depending on the check definition it calls into the actual waf API.
+
+A simple example using pkg-config would be::
+
+  {
+      'name': '--vdpau',
+      'desc': 'VDPAU acceleration',
+      'deps': [ 'x11' ],
+      'func': check_pkg_config('vdpau', '>= 0.2'),
+  }
+
+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
+``config.h``, if not ``#define HAVE_VDPAU 0`` will be added.
+
+The defines names are automatically prepended with ``HAVE_``, capitalized and
+special characters are replaced with underscores. This happens in
+``waftools/inflectors.py``.
+
+Mandatory fields:
+-----------------
+
+``name``: indicates the unique identifier used by the custom dependency code
+to refer to a feature. If the unique identifier is prepended with ``--``
+the build system will also generate options for ``./waf configure`` so that
+the feature can be enabled and disabled.
+
+``desc``: this is the textual representation of the feature used in the
+interactions with the users.
+
+``func``: function that will perform the check. These functions are defined in
+``waftools/checks``. The reusable checks are all functions that return
+functions. The return functions will then be applied using waf's configuration
+context.
+
+The source code for the reusable checks is a bit convoluted, but it should be
+easy to pick up their usage from the ``wscript``. Their signature mirrors
+the semantics of some of the shell functions used in mplayer.
+
+If someone expresses some interest, I will extend this document with official
+documentation for each check function.
+
+Optional fields
+---------------
+
+``deps``: list of dependencies of this feature. It is a list of names of
+other features as defined in the ``name`` field (minus the eventual leading
+``--``). All of the dependencies must be satisfied. If they are not the check
+will be skipped without even running ``func``.
+
+``deps_any``: like deps but it is satisfied even if only one of the dependencies
+is satisfied. You can think of ``deps`` as a 'and' condition and ``deps_any``
+as a 'or' condition.
+
+``deps_neg``: like deps but it is satisfied when none of the dependencies is
+satisfied.
+
+``req``: defaults to False. If set to True makes this feature a hard
+dependency of mpv (configuration will fail if autodetection fails). If set to
+True you must also provide ``fmsg``.
+
+``fmsg``: string with the failure message in case a required dependency is not
+satisfied.
+
+``os_specific_checks``: this takes a dictionary that has ``os-`` dependencies
+as keys (such as ``os-win32``), and by values has another dictionary that is
+merged on top of the current feature definition only for that specific OS.
+For example::
+
+  {
+      'name': '--pthreads',
+      'desc': 'POSIX threads',
+      'func': check_pthreads,
+      'os_specific_checks': {
+          'os-win32': {
+              'func': check_pthreads_w32_static.
+          }
+      }
+  }
+
+will override the value of ``func`` with ``check_pthreads_w32_static`` only
+if the target OS of the build is Windows.
+
+``groups``: groups a dependency with another one. This can be used to disabled
+all the grouped dependencies with one ``--disable-``. At the moment this is
+only used for OpenGL backends, where you want to disable them when
+``--disable-gl`` is passed to the configure.
+
+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
+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.
+
+All of the custom Python for this is inside the function ``filtered_sources``
+contained in the file ``waftools/dependencies.py``.
+
+Also ``dependencies_use`` and ``dependencies_includes`` collect cflags and
+ldflags that were generated from the features checks in the configure step.
@@ -1,8 +1,8 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+        51 Franklin St, 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.

@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.

  When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
 modification follow.
-
+
                    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.

 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), 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 Programs

  If you develop a new program, and you want it to be of the greatest
@@ -303,9 +303,10 @@ the "copyright" line and a pointer to where the full notice is found.
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+

 Also add information on how to contact you by electronic and paper mail.

@@ -335,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
@@ -55,7 +55,7 @@ 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
@@ -111,7 +111,7 @@ 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

@@ -158,7 +158,7 @@ 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
@@ -216,7 +216,7 @@ 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.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
 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
@@ -329,7 +329,7 @@ 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
@@ -370,7 +370,7 @@ 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
@@ -422,7 +422,7 @@ 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
@@ -456,7 +456,7 @@ 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
@@ -1,6 +1,8 @@
-![mpv logo](https://raw.githubusercontent.com/mpv-player/mpv.io/master/source/images/mpv-logo-128.png)
+![http://mpv.io/](https://raw.githubusercontent.com/mpv-player/mpv.io/master/source/images/mpv-logo-128.png)

-# mpv
+## mpv
+
+--------------


 * [External links](#external-links)
@@ -9,9 +11,12 @@
 * [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)

@@ -20,45 +25,36 @@


 * [Wiki](https://github.com/mpv-player/mpv/wiki)
-* [FAQ][FAQ]
-* [Manual](https://mpv.io/manual/master/)
+* [FAQ](https://github.com/mpv-player/mpv/wiki/FAQ)
+* [Manual](http://mpv.io/manual/master/)


 ## Overview


-**mpv** is a free (as in freedom) media player for the command line. It supports
-a wide variety of media file formats, audio and video codecs, and subtitle types.
-
-There is a [FAQ][FAQ].
+**mpv** is a media 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 10 or later, or macOS 10.15 or later.
+- 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's focus is not on power-efficient playback on
-  embedded or integrated GPUs (for example, hardware decoding is not even
-  enabled by default). Low power GPUs may cause issues like tearing, stutter,
-  etc. The main video output uses shaders for video rendering and scaling,
-  rather than GPU fixed function hardware. 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.
+- 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.

-mpv does not go out of its way to break on older hardware or old, unsupported
-operating systems, but development is not done with them in mind. Keeping
-compatibility with such setups is not guaranteed. If things work, consider it
-a happy accident.

 ## Downloads


 For semi-official builds and third-party packages please see
-[mpv.io/installation](https://mpv.io/installation/).
+[mpv.io/installation](http://mpv.io/installation/).

 ## Changelog

@@ -78,56 +74,69 @@ Changes to the default key bindings are indicated in


 Compiling with full features requires development files for several
-external libraries. Mpv requires [meson](https://mesonbuild.com/index.html)
-to build. Meson can be obtained from your distro or PyPI.
+external libraries. Below is a list of some important requirements.

-After creating your build directory (e.g. `meson setup build`), you can view a list
-of all the build options via `meson configure build`. You could also just simply
-look at the `meson_options.txt` file. Logs are stored in `meson-logs` within
-your build directory.
+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.
+
+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
+detect it, the file `build/config.log` may contain information about the
+reasons for the failure.
+
+NOTE: To avoid cluttering the output with unreadable spam, `--help` only shows
+one of the two switches for each option. If the option is autodetected by
+default, the `--disable-***` switch is printed; if the option is disabled by
+default, the `--enable-***` switch is printed. Either way, you can use
+`--enable-***` or `--disable-**` regardless of what is printed by `--help`.
+
+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:

-    meson setup build
-    meson compile -C build
-    meson install -C build
+    ./bootstrap.py
+    ./waf configure
+    ./waf
+    ./waf install

 Essential dependencies (incomplete list):

 - gcc or clang
- X development headers (xlib, xrandr, xext, xscrnsaver, xpresent, libvdpau,
+- 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)
- libplacebo
 - 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)
- nvdec and vaapi libraries for hardware decoding on Linux (optional)
+- vdpau and vaapi libraries for hardware decoding on Linux (optional)

-Libass dependencies (when building libass):
+Libass dependencies:

 - gcc or clang, yasm on x86 and x86_64
 - fribidi, freetype, fontconfig development headers (for libass)
- harfbuzz (required for correct rendering of combining characters, particularly
-  for correct rendering of non-English text on OSX, and Arabic/Indic scripts on
-  any platform)
+- 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 (when building FFmpeg):
+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)
 - For native DASH playback, FFmpeg needs to be built with --enable-libxml2
-  (although there are security implications, and DASH support has lots of bugs).
- AV1 decoding support requires dav1d.
+  (although there are security implications).
 - For good nvidia support on Linux, make sure nv-codec-headers is installed
  and can be found by configure.
+- Libav support is broken. (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,
@@ -140,14 +149,36 @@ or cross-compile from Linux with MinGW. See
 [Windows compilation][windows_compilation].


+## FFmpeg vs. Libav
+
+
+Generally, mpv should work with the latest release as well as the git version
+of FFmpeg. Libav support is currently broken, because they did not add certain
+FFmpeg API changes which mpv relies on.
+
+
+## FFmpeg ABI compatibility
+
+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.
+
+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.
+
+Newer mpv versions will refuse to start if runtime and compile time FFmpeg
+library versions mismatch.
+
 ## Release cycle

-Once or twice a year, a release is cut off from the current development state
-and is assigned a 0.X.0 version number. No further maintenance is done, except
-in the event of security issues.
+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.
+are also expected to apply their own patches in case of bugs and security
+issues.

 Releases other than the latest release are unsupported and unmaintained.

@@ -173,35 +204,45 @@ 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%3Ameta%3Afeature-request)
+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.

+## Relation to MPlayer and mplayer2
+
+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.
+
+For details see [FAQ entry](https://github.com/mpv-player/mpv/wiki/FAQ#How_is_mpv_related_to_MPlayer).
+
+If you are wondering what's different from mplayer2 and MPlayer, an incomplete
+and largely unmaintained list of changes is located [here][mplayer-changes].
+
 ## License

-GPLv2 "or later" by default, LGPLv2.1 "or later" with `-Dgpl=false`.
+GPLv2 "or later" by default, LGPLv2.1 "or later" with `--enable-lgpl`.
 See [details.](https://github.com/mpv-player/mpv/blob/master/Copyright)

-## History
-
-This software is based on the MPlayer project. Before mpv existed as a project,
-the code base was briefly developed under the mplayer2 project. For details,
-see the [FAQ][FAQ].

 ## 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.libera.chat`
- **Developer IRC Channel**: `#mpv-devel` on `irc.libera.chat`
+ - **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.

-[FAQ]: https://github.com/mpv-player/mpv/wiki/FAQ
 [releases]: https://github.com/mpv-player/mpv/releases
 [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
+[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
@@ -1,43 +1,90 @@
-Release 0.37.0
+Release 0.29.1
 ==============

-This release requires FFmpeg 4.4 or newer and libplacebo 6.338.0 or newer.
+A bug fix release for the 0.29 release branch.

-This is the first release to unconditionally require libplacebo, but note that
-the new improved renderer (vo_gpu_next) is not yet the default.
+Fixes and Minor Enhancements
+----------------------------
+
+- af_rubberband: Fix for A-V drift on seeking.
+- ao_alsa: Fixes to remove spam during pausing and end-of-file.
+- ao_jack: Fix for mpv attempting to connect to non-standard devices such as MIDI.
+- ao_openal: Drop support for Apple's bundled OpenAL due to lack of features to successfully build.
+- ao_pulse: Fix for audio buffer length calculation.
+- demux_lavf: Fix EDL playback of certain DASH streams.
+- demux_lavf: Mark v4l streams as not seekable.
+- demux_raw: Fix for gapless playback from raw audio input.
+- drm_atomic: Fix to enable video output with devices without a video overlay plane.
+- encode: Fix for crashes in case of failure to write to output.
+- encode: Fix for encoding when utilizing lavfi-complex.
+- Fix to strip HDR peak metadata if attached to SDR video (#6111)
+- macOS: Capability to fall back on SW rendering for testing purposes.
+- macOS: Fix for issues with the main menu.
+- macOS: Fix for side by side split view.
+- macOS: Fixes for crashes, most notably those happening on 10.14 (#5908, #6097, #6041, #6062).
+- macOS: No longer let older, unsupported versions of the Swift build tools through configure.
+- manpage: Misc fixups.
+- stream_{smb,file}: Fix for partial writes to buffers.
+- stream_libarchive: Fix hang when an out-of-bound seek happens.
+- stream_smb: Fix for crashes due to libsmbclient and threading (#5936).
+- vo_gpu: Fix for corruption when multiple compute shaders override each others' block sizes (#6083).
+- ytdl_hook: Always load "ytdl://" URLs with ytdl_hook first.
+- ytdl_hook: Fix audio streams not being picked up for some sites.
+
+Options and Commands
+--------------------
+
+Added
+~~~~~
+
+- `--cocoa-cb-sw-renderer` to control whether or not to fall back on software rendering on macOS.
+
+Release 0.29.0
+==============
+
+This release requires FFmpeg 4.0 or newer.


 Features
 --------

-New
-~~~
+Added
+~~~~~

- ao_oss: add SPDIF passthrough support
- hwtransfer: implement support for HW->HW format conversions
- stream/dvbin: add support for delivery system ISDB-T
- audio/chmap: support up to 64 channels (including 22.2 layout)
- libmpv: add mpv_time_ns()
- vo_gpu, vo_gpu_next: add Vulkan support for macOS
- meson: make libplacebo a required dependency
- hwdec: support videotoolbox hwdec with libplacebo
+- ao/openal: Add better sample format and channel layout selection
+- ao/openal: Add support for direct channels output
+- cocoa-cb: initial implementation via opengl-cb API
+- context_drm_egl: Introduce 30bpp support (requires Mesa 18.0.0_rc4 or later)
+- osx: add some more menu bar items as suggested by Apples's HIG
+- vo_gpu: make screenshots use the GL renderer (#5498, #5240)
+- x11: support Shift+TAB as an input key bind (#5849)
+- ytdl_hook: support native dash demuxer, if present


 Changed
 ~~~~~~~

- msg: print warning and error messages to stderr
- options: restore old default subtitle selection behavior
- input.conf: swap wheel up/down with wheel left/right
+- ao_alsa, ao_pulse: reduce requested buffer size
+- audio: change format negotiation, remove channel remix fudging
+- client API: deprecate opengl-cb API and introduce a replacement API
+- demux: lower demuxer cache default sizes from 400MB/400MB to 50MB/150MB
+- osx: always deactivate the early opengl flush on macOS
+- scripting: change when/how player waits for scripts being loaded
+- vo_gpu: various improvements to HDR peak detection
+- vo_gpu: various improvements to HDR tone mapping
+- wayland_common: update to stable xdg-shell
+- ytdl_hook: parse youtube playlist urls to set start index if `--ytdl-raw-option=yes-playlist=` is specified
+
+Deprecated
+~~~~~~~~~~
+
+- af_lavrresample: deprecate this filter


 Removed
 ~~~~~~~

- waf: remove waf as a build system
- osc.lua: remove toggle for forced only subpictures (appeared as [F])
- mac: remove runtime checks and compatibility for macOS older than 10.15
- cocoa: remove deprecated OpenGL cocoa backend
+- build: drop support for SDL1 (only applied to ao_sdl)


 Options and Commands
@@ -46,169 +93,88 @@ Options and Commands
 Added
 ~~~~~

- vo_gpu_next: add --hdr-peak-percentile
- player: add --term-remaining-playtime option
- x11: add --x11-wid-title option
- vo_gpu_next: add --libplacebo-opts
- player: add --subs-match-os-language option (replaces 'auto' option)
- vo: add --video-crop
- win32: add --window-corners, --window-affinity, --title-bar, --backdrop-type
- sub: add --sub-stretch-durations option
+- add a number of --audio-resample-* options, which should from now on be used instead of --af-defaults=lavrresample:
+- ao/openal: --openal-direct-channels
+- command: add --osd-on-seek option defaulting to bar
+- command: add a change-list command (#5435)
+- options: add --http-proxy
+- options: add a builtin low-latency profile
+- vaapi: add option to select a non-default device path with --vaapi-device (#4320)
+- video: add option to reduce latency by 1 or 2 frames
+- vo_gpu: introduce --target-peak (#5521)


 Changed
 ~~~~~~~

- builtin.conf: add --hdr-peak-percentile=99.995 to gpu-hq profile
- player: add 'always' option to --subs-fallback-forced
- demux_playlist: default to --directory-mode=lazy
- builtin.conf: add --allow-delayed-peak-detect=no to gpu-hq profile
- vo_gpu, vo_gpu_next: support --icc-3dlut-size=auto
- demux: prepend some cache options with --demuxer-
- builtin.conf: modernize internal profiles for higher quality rendering by default,
-  rename 'gpu-hq' profile to 'high-quality', add 'fast' profile
- vo_gpu, vo_gpu_next: default to dscale=hermite
- builtin.conf: remove deprecated 'opengl-hq' profile
- options: remove a bunch of old option fallbacks/deprecated ones
- vo_gpu: allow --deband-iterations to be 0
- stream_cdda: deprecate --cdda-toc-bias and always check for offsets
- options: disable --allow-delayed-peak-detect by default
- options: adjust default of --watch-later-options
+- command: change cycle-value command behavior (#5772)
+- config: replace config dir lua-settings/ with dir script-opts/
+- options: --lavfi-complex now requires uniquely named filter pads.
+- options: --ytdl is now always enabled, even for libmpv
+- options: make --deinterlace=yes always deinterlace (#5219)
+- options: slightly improve filter help output for lavfi bridge
+- vo: rename --vo=opengl-cb to --vo=libmpv


 Deprecated
 ~~~~~~~~~~

- command: deprecate shared-script-properties
- demux_cue: deprecate --demuxer-cue-codepage for --metadata-codepage
+- encoding: deprecate a bunch of obscure options (--ovoffset, --oaoffset, --ovfirst, --oafirst)
+- options: deprecate --vf-defaults and --af-defaults
+- osx: --gpu-context=cocoa with --gpu-api=opengl is now deprecated in favour of --vo=libmpv


 Removed
 ~~~~~~~

- player: remove special 'auto' option from alang/slang/vlang (previous default)
- vo_gpu: remove --tone-mapping-mode
- vo_gpu: remove --scale-wblur, --scale-cutoff etc.
- vo_gpu: remove --scaler-lut-size
- m_option: drop support for -del for list options
+- command: remove an old compatibility hack that allowed CLI aliases to be set as property, deprecated in 0.26.0
+- input: remove legacy command handling for MPlayer commands that were deprecated in 2013
+- options: drop --opensles-sample-rate, as --audio-samplerate should be used if desired
+- options: drop deprecated --videotoolbox-format, --ff-aid, --ff-vid, --ff-sid, --ad-spdif-dtshd, --softvol options
+- options: remove --video-stereo-mode
+- options: remove deprecated ao/vo auto profiles
+- options: remove the following encoding options: --ocopyts (now the default, old timestamp handling is gone), --oneverdrop (now default), --oharddup (you need to use --vf=fps=VALUE), --ofps, --oautofps, --omaxfps


 Fixes and Minor Enhancements
 ----------------------------

- build: remove unneeded libdl requirement for vaapi
- zimg: fix abort on subsampled input with odd heights
- video_writer: fix gamma for YUV screenshots
- player/video: fix possible crash when changing lavfi-complex
- ad_spdif: fix segfault due to early deallocation
- ao_pipewire: fix race conditon with setting the media role
- draw_bmp: fix overflowing coordinates in mark_rcs
- ao_sndio: use sio_flush() to improve controls responsiveness
- vo_vdpau: fix hwdec for this vo
- vo_gpu, vo_gpu_next: fix setting an empty dscale
- vd_lavc: repeatedly attempt to fallback if hwdec fails in reinit
- options: fix relative time parsing on negative input
- win32: signal DPI changes correctly
- mp_image: properly infer color levels for some pixfmts
- vo_gpu_next: add ability to use named hook params
- vo_gpu_next: take into account PAR when taking screenshots
- ao_audiotrack: support more channel layouts
- osc.lua: support speed-independent time-remaining display
- sub: fix switching tracks while paused
- audio: fix clipping with gapless audio enabled
- player/video: avoid spamming logs with EOF
- player/command: detect aspect ratio name and show it in stats.lua
- wayland: keyboard input fixes
- demux_playlist: remove len restriction on headerless m3u
- win32: fix display resolution calculation on mulitple monitors
- vo_gpu_next: multiple adjustments and fixes to interpolation
- loadfile: avoid infinite playlist loading loops
- context_drm_egl: don't free EGL properties if they are null
- x11: require xrandr 1.4, remove xinerama support
- drm_common: skip cards that don't have connected outputs
- win32_common: fixes minimized window being focused on launch
- ao/jack: set device_buffer to JACK buffer size
- meson: rename all features with underscores
- input: add new keys: Back, Tools, ZoomIn, ZoomOut
- win32: don't ignore --screen and --fs-screen
- input: add missing keypad key defines and Windows multimedia keys
- player: use audio pts corresponding to playing audio on EOF
- command: add sub-ass-extradata property
- vo_dmabuf_wayland: unmap osd surface when not needed
- player: always write redirect entries for resuming playback
- stats.lua: reorganize how video params are displayed
- stats.lua: display HDR metadata
- osc.lua: add scrolling to the seekbar
- demux_lavf: prefer track durations over container durations to determine total
- vo: vulkan: allow picking devices by UUID
- video: allow overriding container crop if it is present
- vo_gpu, vo_gpu_next, screenshot: support applying crop for screenshots
- sd_lavc: account for floating point inaccuracy, fix sub PTS
- stream: accept dav:// and davs:// urls
- filter_kernels: refine some constants
- filter_kernels: add ewa_lanczos4sharpest
- osc.lua: add scrolling to audio/sub buttons
- demux_mkv: support cropping and rotation
- vo_dmabuf_wayland: support 90 degree rotations
- filter_kernels: add hermite filter
- vo: avoid unnecessary redraws when the OSD shows
- scripting: support DLL cplugins
- af_scaletempo2: various bug fixes
- sdl_gamepad: fix button detection on modern controllers
- vo_dmabuf_wayland: support osd rendering when there's no video
- demux_playlist: add --directory-mode=auto
- vo_gpu_next: use proper color for subtitles
- win32: add an option to change window affinity and control title bar state
- win32: reduce top border thickness to imitate DWM invisible borders
- wayland: remove gnome-specific idle-inhibit warning
- win32: pass window handle to the window-id property
- osc.lua: fix calculation for slider's min-max average
- recorder: fix a couple of memory leaks
- af_scaletempo2: raise max playback rate to 8.0
- osc.lua: move the idle logo behind other overlays
- hwdec_drmprime: add nv16 support
- various: change internal timing code to work in nanoseconds instead of microseconds
- vo: increase display refresh rate estimation limit from 99 Hz to 400 Hz
- external_files: base cover-art-whitelist on cover-art-auto-exts
- path: don't override cache and state paths with --config-dir
- codec_tags: map some more image mimetypes
- af/vf-command: add ability to target a specific lavfi filter
- win32: prevent white window flash on startup
- demux_playlist: use --metacode-codepage when parsing playlist files
- video: revert racey change that led to stutter and deadlocking
- console.lua: various improvements
- command: add playlist-next-playlist and playlist-prev-playlist
- ytdl_hook.lua: set metadata with single tracks
- defaults.lua: add a disabled parameter to timer constructors
- terminal-unix: race condition fixes
- af_scaletempo2: better defaults
- hwtransfer: handle hwcontexts that don't implement frame constraints
- stream_cdda: remove fallback for ancient libcdio versions
- osdep: drop support for C11 without atomics
- dvbin: do a big cleanup on code style and functions
- ytdl_hook.lua: parse the separate cookies field
- sub: update subtitles if current track is an image
- javascript: use --js-memory-report option instead of MPV_LEAK_REPORT
- ao_coreaudio: signal buffer underruns
- ytdl_hook.lua: support thumbnails
- demux: make hysteresis-secs respect cache-secs
- mp_image: pass rotation correctly to/from AVFrame correctly
- various: add new internal mp_thread abstraction and use it
- drm: use present_sync mechanism for presentation feedback
- vo_gpu: apply ICC profile and dithering only to window screenshots
- audio: introduce ao_read_data_nonblocking() and use it in relevant backends
- wayland: obey initial size hints set by the compositor
- command: export storage aspect ratio (sar) properties
- vo: delay vsync samples by at least 10 refreshes to improve convergence time
- vo_sdl: fix broken mouse wheel multiplier
- vo_gpu_next: simplify cache code and don't re-save when unmodified
+- HIDRemote: fix volume buttons on macOS 10.13 (#5721)
+- TOOLS/autoload: Fix broken "disabled" option
+- TOOLS/autoload: be more robust with slow directory listings (#5618)
+- ao_sdl: fix default buffer size
+- build: add static libraries to libmpv.pc
+- build: bump waf to 2.0.9 (fixes Python 3.7 compatibility)
+- build: manually add standard library search paths for linking (#5791)
+- common: round all integer times to milliseconds
+- demux, player: fix playback of sparse video streams (w/ still images)
+- demux: support for some kinds of timed metadata (e.g. ICY)
+- demux_mkv: add V_AV1 identifier for AV1
+- demux_mkv: support Meridian Lossless Packing in Matroska (#5923)
+- display additional metadata tags during video playback
+- drm_atomic: Fix memory leaks in drm_atomic_create
+- enable cache for FUSE filesystems on OpenBSD and FreeBSD
+- gpu: prefer 16bit floating point FBO formats to 16bit integer ones
+- hwdec_vaegl: Fix VAAPI EGL interop used with gpu-context=drm
+- input.conf: use exact value for [ binding, which does the inverse of ]
+- input: add a keybinding to toggle hardware decoding
+- input: minor additions to default key bindings (#973)
+- osc: fix accidentally skipping files when seeking with slider
+- player: fix strange behavior on edition switching
+- player: fix track autoselection of external files yet again
+- terminal-unix: stop trying to read when terminal disappears (#5842)
+- video: actually wait for last frame being rendered on EOF
+- video: fix --video-rotate in some cases
+- video: fix crash with vdpau when reinitializing rendering (#5447)
+- vo_gpu: fix anamorphic screenshots (#5619)
+- vo_vdpau: fix resizing and rotation problems


 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.36.0..v0.37.0`
+A complete changelog can be seen by running `git log v0.28.2..v0.29.0`
 in the git repository or by visiting either
-https://github.com/mpv-player/mpv/compare/v0.36.0...v0.37.0 or
-https://git.srsfckn.biz/mpv/log/?qt=range&q=v0.36.0..v0.37.0
+https://github.com/mpv-player/mpv/compare/v0.28.2...v0.29.0 or
+https://git.srsfckn.biz/mpv/log/?qt=range&q=v0.28.2..v0.29.0
@@ -0,0 +1,27 @@
+#!/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
@@ -0,0 +1,72 @@
+#!/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
+)
@@ -1,67 +0,0 @@
-#!/usr/bin/env python3
-"""
-Wrapper around docutils rst2x commands,
-converting their dependency files to a format understood by meson/ninja.
-"""
-
-#
-# 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/>.
-#
-
-import os
-import subprocess
-import sys
-
-
-def convert_depfile(output, depfile):
-    with open(depfile, 'r') as f:
-        deps = f.readlines()
-
-    with open(depfile, 'w') as f:
-        f.write(os.path.abspath(output))
-        f.write(': \\\n')
-        for dep in deps:
-            dep = dep[:-1]
-            f.write('\t')
-            f.write(os.path.abspath(dep))
-            f.write(' \\\n')
-
-def remove(path):
-    try:
-        os.remove(path)
-    except FileNotFoundError:
-        pass
-
-argv = sys.argv[1:]
-
-depfile = None
-output = argv[-1]
-
-for opt, optarg in zip(argv, argv[1:]):
-    if opt == '--record-dependencies':
-        depfile = optarg
-
-try:
-    proc = subprocess.run(argv, check=True)
-    if depfile is not None:
-        convert_depfile(output, depfile)
-except:
-    remove(output)
-    if depfile is not None:
-        remove(depfile)
-    sys.exit(1)
-
-sys.exit(proc.returncode)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python

 import re
 import os
@@ -20,91 +20,38 @@ def is_user_lib(objfile, libname):
           not "libc." in libname and \
           not "libgcc." in libname and \
           not os.path.basename(libname) == 'Python' and \
-           not os.path.basename(objfile) in libname and \
-           not "libswift" in libname
+           not os.path.basename(objfile) in libname

-def otool(objfile, rapths):
-    command = "otool -L '%s' | grep -e '\t' | awk '{ print $1 }'" % objfile
+def otool(objfile):
+    command = "otool -L %s | grep -e '\t' | awk '{ print $1 }'" % objfile
    output  = subprocess.check_output(command, shell = True, universal_newlines=True)
-    libs = set(filter(partial(is_user_lib, objfile), output.split()))
-
-    libs_resolved = set()
-    libs_relative = set()
-    for lib in libs:
-        lib_path = resolve_lib_path(objfile, lib, rapths)
-        libs_resolved.add(lib_path)
-        if lib_path != lib:
-            libs_relative.add(lib)
-
-    return libs_resolved, libs_relative
-
-def get_rapths(objfile):
-    rpaths = []
-    command = "otool -l '%s' | grep -A2 LC_RPATH | grep path" % objfile
-    pathRe = re.compile("^\s*path (.*) \(offset \d*\)$")
-
-    try:
-        result = subprocess.check_output(command, shell = True, universal_newlines=True)
-    except:
-        return rpaths
-
-    for line in result.splitlines():
-        rpaths.append(pathRe.search(line).group(1).strip())
-
-    return rpaths
-
-def get_rpaths_dev_tools(binary):
-    command = "otool -l '%s' | grep -A2 LC_RPATH | grep path | grep \"Xcode\|CommandLineTools\"" % binary
-    result  = subprocess.check_output(command, shell = True, universal_newlines=True)
-    pathRe = re.compile("^\s*path (.*) \(offset \d*\)$")
-    output = []
-
-    for line in result.splitlines():
-        output.append(pathRe.search(line).group(1).strip())
-
-    return output
-
-def resolve_lib_path(objfile, lib, rapths):
-    if os.path.exists(lib):
-        return lib
-
-    if lib.startswith('@rpath/'):
-        lib = lib[len('@rpath/'):]
-        for rpath in rapths:
-            lib_path = os.path.join(rpath, lib)
-            if os.path.exists(lib_path):
-                return lib_path
-    elif lib.startswith('@loader_path/'):
-        lib = lib[len('@loader_path/'):]
-        lib_path = os.path.normpath(os.path.join(objfile, lib))
-        if os.path.exists(lib_path):
-            return lib_path
-
-    raise Exception('Could not resolve library: ' + lib)
+    return set(filter(partial(is_user_lib, objfile), output.split()))

 def install_name_tool_change(old, new, objfile):
-    subprocess.call(["install_name_tool", "-change", old, new, objfile], stderr=subprocess.DEVNULL)
+    subprocess.call(["install_name_tool", "-change", old, new, objfile])

 def install_name_tool_id(name, objfile):
-    subprocess.call(["install_name_tool", "-id", name, objfile], stderr=subprocess.DEVNULL)
+    subprocess.call(["install_name_tool", "-id", name, objfile])

-def install_name_tool_add_rpath(rpath, binary):
-    subprocess.call(["install_name_tool", "-add_rpath", rpath, binary])
-
-def install_name_tool_delete_rpath(rpath, binary):
-    subprocess.call(["install_name_tool", "-delete_rpath", rpath, binary])
-
-def libraries(objfile, result = dict(), result_relative = set(), rapths = []):
-    rapths = get_rapths(objfile) + rapths
-    libs_list, libs_relative = otool(objfile, rapths)
+def libraries(objfile, result = dict()):
+    libs_list       = otool(objfile)
    result[objfile] = libs_list
-    result_relative |= libs_relative

    for lib in libs_list:
        if lib not in result:
-            libraries(lib, result, result_relative, rapths)
+            libraries(lib, result)

-    return result, result_relative
+    return result
+
+def leafs(libs_dict, processed = []):
+    result    = []
+    processed = set(processed)
+
+    for objfile, libs in libs_dict.items():
+        if libs <= processed:
+            result.append(objfile)
+
+    return result

 def lib_path(binary):
    return os.path.join(os.path.dirname(binary), 'lib')
@@ -112,15 +59,15 @@ def lib_path(binary):
 def lib_name(lib):
    return os.path.join("@executable_path", "lib", os.path.basename(lib))

-def process_libraries(libs_dict, libs_dyn, binary):
-    libs_set = set(libs_dict)
-    # Remove binary from libs_set to prevent a duplicate of the binary being
-    # added to the libs directory.
-    libs_set.remove(binary)
+def process_libraries(libs_dict, binary, processed = []):
+    ls   = leafs(libs_dict, processed)
+    diff = set(ls) - set(processed)
+    if diff == set([binary]):
+        return

-    for src in libs_set:
+    for src in diff:
        name = lib_name(src)
-        dst = os.path.join(lib_path(binary), os.path.basename(src))
+        dst  = os.path.join(lib_path(binary), os.path.basename(src))

        shutil.copy(src, dst)
        os.chmod(dst, 0o755)
@@ -129,53 +76,21 @@ def process_libraries(libs_dict, libs_dyn, binary):
        if src in libs_dict[binary]:
            install_name_tool_change(src, name, binary)

-        for p in libs_set:
+        for p in processed:
            if p in libs_dict[src]:
                install_name_tool_change(p, lib_name(p), dst)

-        for lib in libs_dyn:
-            install_name_tool_change(lib, lib_name(lib), dst)
-
-    for lib in libs_dyn:
-        install_name_tool_change(lib, lib_name(lib), binary)
-
-def process_swift_libraries(binary):
-    command = ['xcrun', '--find', 'swift-stdlib-tool']
-    swiftStdlibTool = subprocess.check_output(command, universal_newlines=True).strip()
-    # from xcode11 on the dynamic swift libs reside in a separate directory from
-    # the std one, might need versioned paths for future swift versions
-    swiftLibPath = os.path.join(swiftStdlibTool, '../../lib/swift-5.0/macosx')
-    swiftLibPath = os.path.abspath(swiftLibPath)
-
-    command = [swiftStdlibTool, '--copy', '--platform', 'macosx', '--scan-executable', binary, '--destination', lib_path(binary)]
-
-    if os.path.exists(swiftLibPath):
-        command.extend(['--source-libraries', swiftLibPath])
-
-    subprocess.check_output(command, universal_newlines=True)
-
-    print(">> setting additional rpath for swift libraries")
-    install_name_tool_add_rpath("@executable_path/lib", binary)
-
-def remove_dev_tools_rapths(binary):
-    for path in get_rpaths_dev_tools(binary):
-        install_name_tool_delete_rpath(path, binary)
+    return ls

 def main():
    binary = os.path.abspath(sys.argv[1])
    if not os.path.exists(lib_path(binary)):
        os.makedirs(lib_path(binary))
-    print(">> gathering all linked libraries")
-    libs, libs_rel = libraries(binary)
+    libs = libraries(binary)

-    print(">> copying and processing all linked libraries")
-    process_libraries(libs, libs_rel, binary)
-
-    print(">> removing rpath definitions towards dev tools")
-    remove_dev_tools_rapths(binary)
-
-    print(">> copying and processing swift libraries")
-    process_swift_libraries(binary)
+    libs_processed = process_libraries(libs, binary)
+    while libs_processed is not None:
+        libs_processed = process_libraries(libs, binary, libs_processed)

 if __name__ == "__main__":
    main()
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/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
@@ -22,23 +22,27 @@
 # 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)]
+    conv = ['\\' + ("%03o" % c) for c in range(256)]
    safe_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" \
-                 "0123456789!#%&'()*+,-./:;<=>[]^_{|}~ "
+                 "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[c] for c in line) + '"\n')
+        outfile.write('"' + ''.join(conv[pord(c)] for c in line) + '"\n')

 if __name__ == "__main__":
-    outfile = open(sys.argv[2], "w")
    with open(sys.argv[1], 'rb') as infile:
-        file2string(sys.argv[1], infile, outfile)
+        file2string(sys.argv[1], infile, sys.stdout)
@@ -22,7 +22,7 @@
 testfun()
 {
    $ILDETECT_MPV "$@" \
-        --vf-add=lavfi="[idet]" --msg-level=ffmpeg=v \
+        --vf-add=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 } \
@@ -2,7 +2,7 @@
 -- filter including key bindings for adjusting parameters.
 --
 -- See https://ffmpeg.org/ffmpeg-filters.html#acompressor for explanation
-- of the parameters.
+-- of the parameteres.

 local mp = require 'mp'
 local options = require 'mp.options'
@@ -1,298 +1,114 @@
--[[
-This script uses the lavfi cropdetect filter and the video-crop property to
-automatically crop the currently playing video with appropriate parameters.
+-- This script uses the lavfi cropdetect filter to automatically
+-- insert a crop filter with appropriate parameters for the currently
+-- playing video.
+--
+-- It registers the key-binding "C" (shift+c), which when pressed,
+-- inserts the filter vf=lavfi=cropdetect. After 1 second, it then
+-- inserts the filter vf=crop=w:h:x:y, where w,h,x,y are determined
+-- from the vf-metadata gathered by cropdetect. The cropdetect filter
+-- is removed immediately after the crop filter is inserted as it is
+-- no longer needed.
+--
+-- If the "C" key is pressed again, the crop filter is removed
+-- restoring playback to its original state.
+--
+-- Since the crop parameters are determined from the 1 second of video
+-- between inserting the cropdetect and crop filters, the "C" key
+-- should be pressed at a position in the video where the crop region
+-- is unambiguous (i.e., not a black frame, black background title
+-- card, or dark scene).
+--
+-- The default delay between insertion of the cropdetect and
+-- crop filters may be overridden by adding
+--
+-- --script-opts=autocrop.detect_seconds=<number of seconds>
+--
+-- to mpv's arguments. This may be desirable to allow cropdetect more
+-- time to collect data.
+require "mp.msg"

-It automatically crops the video when playback starts.
+script_name = mp.get_script_name()
+cropdetect_label = string.format("%s-cropdetect", script_name)
+crop_label = string.format("%s-crop", script_name)

-You can also manually crop the video by pressing the "C" (shift+c) key.
-Pressing it again undoes the crop.
-
-The workflow is as follows: First, it inserts the cropdetect filter. After
-<detect_seconds> (default is 1) seconds, it then sets video-crop based on the
-vf-metadata values gathered by cropdetect. The cropdetect filter is removed
-after video-crop is set as it is no longer needed.
-
-Since the crop parameters are determined from the 1 second of video between
-inserting the cropdetect filter and setting video-crop, the "C" key should be
-pressed at a position in the video where the crop region is unambiguous (i.e.,
-not a black frame, black background title card, or dark scene).
-
-If non-copy-back hardware decoding is in use, hwdec is temporarily disabled for
-the duration of cropdetect as the filter would fail otherwise.
-
-These are the default options. They can be overridden by adding
-script-opts-append=autocrop-<parameter>=<value> to mpv.conf.
--]]
-local options = {
-    -- Whether to automatically apply crop at the start of playback. If you
-    -- don't want to crop automatically, add
-    -- script-opts-append=autocrop-auto=no to mpv.conf.
-    auto = true,
-    -- Delay before starting crop in auto mode. You can try to increase this
-    -- value to avoid dark scenes or fade ins at beginning. Automatic cropping
-    -- will not occur if the value is larger than the remaining playback time.
-    auto_delay = 4,
-    -- Black threshold for cropdetect. Smaller values will generally result in
-    -- less cropping. See limit of
-    -- https://ffmpeg.org/ffmpeg-filters.html#cropdetect
-    detect_limit = "24/255",
-    -- The value which the width/height should be divisible by. Smaller
-    -- values have better detection accuracy. If you have problems with
-    -- other filters, you can try to set it to 4 or 16. See round of
-    -- https://ffmpeg.org/ffmpeg-filters.html#cropdetect
-    detect_round = 2,
-    -- The ratio of the minimum clip size to the original. A number from 0 to
-    -- 1. If the picture is over cropped, try adjusting this value.
-    detect_min_ratio = 0.5,
-    -- How long to gather cropdetect data. Increasing this may be desirable to
-    -- allow cropdetect more time to collect data.
-    detect_seconds = 1,
-    -- Whether the OSD shouldn't be used when cropdetect and video-crop are
-    -- applied and removed.
-    suppress_osd = false,
-}
-
-require "mp.options".read_options(options)
-
-local cropdetect_label = mp.get_script_name() .. "-cropdetect"
-
-timers = {
-    auto_delay = nil,
-    detect_crop = nil
-}
-
-local hwdec_backup
-
-local command_prefix = options.suppress_osd and 'no-osd' or ''
-
-function is_enough_time(seconds)
-
-    -- Plus 1 second for deviation.
-    local time_needed = seconds + 1
-    local playtime_remaining = mp.get_property_native("playtime-remaining")
-
-    return playtime_remaining and time_needed < playtime_remaining
+-- 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 = 1
 end

-function is_cropable(time_needed)
-    if mp.get_property_native('current-tracks/video/image') ~= false then
-        mp.msg.warn("autocrop only works for videos.")
-        return false
-    end
-
-    if not is_enough_time(time_needed) then
-        mp.msg.warn("Not enough time to detect crop.")
-        return false
-    end
-
-    return true
-end
-
-function remove_cropdetect()
-    for _, filter in pairs(mp.get_property_native("vf")) do
-        if filter.label == cropdetect_label then
-            mp.command(
-                string.format("%s vf remove @%s", command_prefix, filter.label))
-
-            return
+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

-function restore_hwdec()
-    if hwdec_backup then
-        mp.set_property("hwdec", hwdec_backup)
-        hwdec_backup = nil
-    end
-end
-
-function cleanup()
-    remove_cropdetect()
-
-    -- Kill all timers.
-    for index, timer in pairs(timers) do
-        if timer then
-            timer:kill()
-            timers[index] = nil
-        end
-    end
-
-    restore_hwdec()
-end
-
-function detect_crop()
-    local time_needed = options.detect_seconds
-
-    if not is_cropable(time_needed) then
+function autocrop_start()
+    -- exit if cropdetection is already in progress
+    if timer then
+        mp.msg.warn("already cropdetecting!")
        return
    end

-    local hwdec_current = mp.get_property("hwdec-current")
-    if hwdec_current:find("-copy$") == nil and hwdec_current ~= "no" and
-       hwdec_current ~= "crystalhd" and hwdec_current ~= "rkmpp" then
-        hwdec_backup = mp.get_property("hwdec")
-        mp.set_property("hwdec", "no")
+    -- if there's a crop filter, remove it and exit
+    if del_filter_if_present(crop_label) then
+        return
    end

-    -- Insert the cropdetect filter.
-    local limit = options.detect_limit
-    local round = options.detect_round
-
-    mp.command(
+    -- insert the cropdetect filter
+    ret=mp.command(
        string.format(
-            '%s vf pre @%s:cropdetect=limit=%s:round=%d:reset=0',
-            command_prefix, cropdetect_label, limit, round
+            'vf add @%s:cropdetect=limit=%f:round=2:reset=0',
+            cropdetect_label, 24/255
        )
    )
-
-    -- Wait to gather data.
-    timers.detect_crop = mp.add_timeout(time_needed, detect_end)
+    -- wait to gather data
+    timer=mp.add_timeout(detect_seconds, do_crop)
 end

-function detect_end()
-
-    -- Get the metadata and remove the cropdetect filter.
+function do_crop()
+    -- get the metadata
    local cropdetect_metadata = mp.get_property_native(
-        "vf-metadata/" .. cropdetect_label)
-    remove_cropdetect()
+        string.format("vf-metadata/%s", cropdetect_label)
+    )

-    -- Remove the timer of detect crop.
-    if timers.detect_crop then
-        timers.detect_crop:kill()
-        timers.detect_crop = nil
-    end
-
-    restore_hwdec()
-
-    local meta = {}
-
-    -- Verify the existence of metadata.
+    -- use it to crop if its valid
    if cropdetect_metadata then
-        meta = {
-            w = cropdetect_metadata["lavfi.cropdetect.w"],
-            h = cropdetect_metadata["lavfi.cropdetect.h"],
-            x = cropdetect_metadata["lavfi.cropdetect.x"],
-            y = cropdetect_metadata["lavfi.cropdetect.y"],
-        }
-    else
-        mp.msg.error("No crop data.")
-        mp.msg.info("Was the cropdetect filter successfully inserted?")
-        mp.msg.info("Does your version of ffmpeg/libav support AVFrame metadata?")
-        return
-    end
-
-    -- Verify that the metadata meets the requirements and convert it.
-    if meta.w and meta.h and meta.x and meta.y then
-        local width = mp.get_property_native("width")
-        local height = mp.get_property_native("height")
-
-        meta = {
-            w = tonumber(meta.w),
-            h = tonumber(meta.h),
-            x = tonumber(meta.x),
-            y = tonumber(meta.y),
-            min_w = width * options.detect_min_ratio,
-            min_h = height * options.detect_min_ratio,
-            max_w = width,
-            max_h = height
-        }
-    else
-        mp.msg.error("Got empty crop data.")
-        mp.msg.info("You might need to increase detect_seconds.")
-    end
-
-    apply_crop(meta)
-end
-
-function apply_crop(meta)
-
-    -- Verify if it is necessary to crop.
-    local is_effective = meta.w and meta.h and meta.x and meta.y and
-                         (meta.x > 0 or meta.y > 0
-                         or meta.w < meta.max_w or meta.h < meta.max_h)
-
-    -- Verify it is not over cropped.
-    local is_excessive = false
-    if is_effective and (meta.w < meta.min_w or meta.h < meta.min_h) then
-        mp.msg.info("The area to be cropped is too large.")
-        mp.msg.info("You might need to decrease detect_min_ratio.")
-        is_excessive = true
-    end
-
-    if not is_effective or is_excessive then
-        -- Clear any existing crop.
-        mp.command(string.format("%s set file-local-options/video-crop ''", command_prefix))
-        return
-    end
-
-    -- Apply crop.
-    mp.command(string.format("%s set file-local-options/video-crop %sx%s+%s+%s",
-                             command_prefix, meta.w, meta.h, meta.x, meta.y))
-end
-
-function on_start()
-
-    -- Clean up at the beginning.
-    cleanup()
-
-    -- If auto is not true, exit.
-    if not options.auto then
-        return
-    end
-
-    -- If it is the beginning, wait for detect_crop
-    -- after auto_delay seconds, otherwise immediately.
-    local playback_time = mp.get_property_native("playback-time")
-    local is_delay_needed = playback_time
-        and options.auto_delay > playback_time
-
-    if is_delay_needed then
-
-        -- Verify if there is enough time for autocrop.
-        local time_needed = options.auto_delay + options.detect_seconds
-
-        if not is_cropable(time_needed) then
-            return
+        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",
+                                     crop_label,
+                                     cropdetect_metadata["lavfi.cropdetect.w"],
+                                     cropdetect_metadata["lavfi.cropdetect.h"],
+                                     cropdetect_metadata["lavfi.cropdetect.x"],
+                                     cropdetect_metadata["lavfi.cropdetect.y"]))
+        else
+            mp.msg.error(
+                "Got empty crop data. You might need to increase detect_seconds."
+            )
        end
-
-        timers.auto_delay = mp.add_timeout(time_needed,
-            function()
-                detect_crop()
-
-                -- Remove the timer of auto delay.
-                timers.auto_delay:kill()
-                timers.auto_delay = nil
-            end
-        )
    else
-        detect_crop()
+        mp.msg.error(
+            "No crop data. Was the cropdetect filter successfully inserted?"
+        )
+        mp.msg.error(
+            "Does your version of ffmpeg/libav support AVFrame metadata?"
+        )
    end
+    -- remove the cropdetect filter
+    del_filter_if_present(cropdetect_label)
+    timer=nil
 end

-function on_toggle()
-
-    -- If it is during auto_delay, kill the timer.
-    if timers.auto_delay then
-        timers.auto_delay:kill()
-        timers.auto_delay = nil
-    end
-
-    -- Cropped => Remove it.
-    if mp.get_property("video-crop") ~= "" then
-        mp.command(string.format("%s set file-local-options/video-crop ''", command_prefix))
-        return
-    end
-
-    -- Detecting => Leave it.
-    if timers.detect_crop then
-        mp.msg.warn("Already cropdetecting!")
-        return
-    end
-
-    -- Neither => Detect crop.
-    detect_crop()
-end
-
-mp.add_key_binding("C", "toggle_crop", on_toggle)
-mp.register_event("end-file", cleanup)
-mp.register_event("file-loaded", on_start)
+mp.add_key_binding("C", "auto_crop", autocrop_start)
@@ -2,59 +2,19 @@
 -- the currently played file. It does so by scanning the directory a file is
 -- located in when starting playback. It sorts the directory entries
 -- alphabetically, and adds entries before and after the current file to
-- the internal playlist. (It stops if it would add an already existing
+-- 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).
-
--[[
-To configure this script use file autoload.conf in directory script-opts (the "script-opts"
-directory must be in the mpv configuration directory, typically ~/.config/mpv/).
-
-Example configuration would be:
-
-disabled=no
-images=no
-videos=yes
-audio=yes
-additional_image_exts=list,of,ext
-additional_video_exts=list,of,ext
-additional_audio_exts=list,of,ext
-ignore_hidden=yes
-same_type=yes
-directory_mode=recursive
-
--]]
-
 MAXENTRIES = 5000
-MAXDIRSTACK = 20

 local msg = require 'mp.msg'
 local options = require 'mp.options'
 local utils = require 'mp.utils'

 o = {
-    disabled = false,
-    images = true,
-    videos = true,
-    audio = true,
-    additional_image_exts = "",
-    additional_video_exts = "",
-    additional_audio_exts = "",
-    ignore_hidden = true,
-    same_type = false,
-    directory_mode = "auto"
+    disabled = false
 }
-options.read_options(o, nil, function(list)
-    split_option_exts(list.additional_video_exts, list.additional_audio_exts, list.additional_image_exts)
-    if list.videos or list.additional_video_exts or
-        list.audio or list.additional_audio_exts or
-        list.images or list.additional_image_exts then
-        create_extensions()
-    end
-    if list.directory_mode then
-        validate_directory_mode()
-    end
-end)
+options.read_options(o)

 function Set (t)
    local set = {}
@@ -62,59 +22,17 @@ function Set (t)
    return set
 end

-function SetUnion (a,b)
-    for k in pairs(b) do a[k] = true end
-    return a
-end
-
-function Split (s)
-    local set = {}
-    for v in string.gmatch(s, '([^,]+)') do set[v] = true end
-    return set
-end
-
-EXTENSIONS_VIDEO = Set {
-    '3g2', '3gp', 'avi', 'flv', 'm2ts', 'm4v', 'mj2', 'mkv', 'mov',
-    'mp4', 'mpeg', 'mpg', 'ogv', 'rmvb', 'webm', 'wmv', 'y4m'
+EXTENSIONS = Set {
+    'mkv', 'avi', 'mp4', 'ogv', 'webm', 'rmvb', 'flv', 'wmv', 'mpeg', 'mpg', 'm4v', '3gp',
+    'mp3', 'wav', 'ogm', 'flac', 'm4a', 'wma', 'ogg', 'opus',
 }

-EXTENSIONS_AUDIO = Set {
-    'aiff', 'ape', 'au', 'flac', 'm4a', 'mka', 'mp3', 'oga', 'ogg',
-    'ogm', 'opus', 'wav', 'wma'
-}
-
-EXTENSIONS_IMAGES = Set {
-    'avif', 'bmp', 'gif', 'j2k', 'jp2', 'jpeg', 'jpg', 'jxl', 'png',
-    'svg', 'tga', 'tif', 'tiff', 'webp'
-}
-
-function split_option_exts(video, audio, image)
-    if video then o.additional_video_exts = Split(o.additional_video_exts) end
-    if audio then o.additional_audio_exts = Split(o.additional_audio_exts) end
-    if image then o.additional_image_exts = Split(o.additional_image_exts) end
-end
-split_option_exts(true, true, true)
-
-function create_extensions()
-    EXTENSIONS = {}
-    if o.videos then SetUnion(SetUnion(EXTENSIONS, EXTENSIONS_VIDEO), o.additional_video_exts) end
-    if o.audio then SetUnion(SetUnion(EXTENSIONS, EXTENSIONS_AUDIO), o.additional_audio_exts) end
-    if o.images then SetUnion(SetUnion(EXTENSIONS, EXTENSIONS_IMAGES), o.additional_image_exts) end
-end
-create_extensions()
-
-function validate_directory_mode()
-    if o.directory_mode ~= "recursive" and o.directory_mode ~= "lazy" and o.directory_mode ~= "ignore" then
-        o.directory_mode = nil
-    end
-end
-validate_directory_mode()
-
-function add_files(files)
+function add_files_at(index, files)
+    index = index - 1
    local oldcount = mp.get_property_number("playlist-count", 1)
    for i = 1, #files do
-        mp.commandv("loadfile", files[i][1], "append")
-        mp.commandv("playlist-move", oldcount + i - 1, files[i][2])
+        mp.commandv("loadfile", files[i], "append")
+        mp.commandv("playlist-move", oldcount + i - 1, index + i - 1)
    end
 end

@@ -135,119 +53,58 @@ table.filter = function(t, iter)
    end
 end

-table.append = function(t1, t2)
-    local t1_size = #t1
-    for i = 1, #t2 do
-        t1[t1_size + i] = t2[i]
+-- 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

-- alphanum sorting for humans in Lua
-- http://notebook.kulchenko.com/algorithms/alphanumeric-natural-sorting-for-humans-in-lua
+function clean_key(k)
+    k = (' '..k..' '):gsub("%s+", " "):sub(2, -2):lower()
+    return splitbynum(k)
+end

-function alphanumsort(filenames)
-    local function padnum(n, d)
-        return #d > 0 and ("%03d%s%.12f"):format(#n, n, tonumber(d) / (10 ^ #d))
-            or ("%03d%s"):format(#n, n)
+-- 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
-
-    local tuples = {}
-    for i, f in ipairs(filenames) do
-        tuples[i] = {f:lower():gsub("0*(%d+)%.?(%d*)", padnum), f}
-    end
-    table.sort(tuples, function(a, b)
-        return a[1] == b[1] and #b[2] < #a[2] or a[1] < b[1]
-    end)
-    for i, tuple in ipairs(tuples) do filenames[i] = tuple[2] end
-    return filenames
+    return #xt < #yt
 end

 local autoloaded = nil
-local added_entries = {}
-local autoloaded_dir = nil
-
-function scan_dir(path, current_file, dir_mode, separator, dir_depth, total_files, extensions)
-    if dir_depth == MAXDIRSTACK then
-        return
-    end
-    msg.trace("scanning: " .. path)
-    local files = utils.readdir(path, "files") or {}
-    local dirs = dir_mode ~= "ignore" and utils.readdir(path, "dirs") or {}
-    local prefix = path == "." and "" or path
-    table.filter(files, function (v)
-        -- The current file could be a hidden file, ignoring it doesn't load other
-        -- files from the current directory.
-        if (o.ignore_hidden and not (prefix .. v == current_file) and 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.filter(dirs, function(d)
-        return not ((o.ignore_hidden and string.match(d, "^%.")))
-    end)
-    alphanumsort(files)
-    alphanumsort(dirs)
-
-    for i, file in ipairs(files) do
-        files[i] = prefix .. file
-    end
-
-    table.append(total_files, files)
-    if dir_mode == "recursive" then
-        for _, dir in ipairs(dirs) do
-            scan_dir(prefix .. dir .. separator, current_file, dir_mode,
-                     separator, dir_depth + 1, total_files, extensions)
-        end
-    else
-        for i, dir in ipairs(dirs) do
-            dirs[i] = prefix .. dir
-        end
-        table.append(total_files, dirs)
-    end
-end

 function find_and_add_entries()
    local path = mp.get_property("path", "")
    local dir, filename = utils.split_path(path)
    msg.trace(("dir: %s, filename: %s"):format(dir, filename))
    if o.disabled then
-        msg.debug("stopping: autoload disabled")
+        msg.verbose("stopping: autoload disabled")
        return
    elseif #dir == 0 then
-        msg.debug("stopping: not a local path")
+        msg.verbose("stopping: not a local path")
        return
    end

    local pl_count = mp.get_property_number("playlist-count", 1)
-    this_ext = get_extension(filename)
    -- check if this is a manually made playlist
    if (pl_count > 1 and autoloaded == nil) or
-       (pl_count == 1 and EXTENSIONS[string.lower(this_ext)] == nil) then
-        msg.debug("stopping: manually made playlist")
+       (pl_count == 1 and EXTENSIONS[string.lower(get_extension(filename))] == nil) then
        return
    else
-        if pl_count == 1 then
-            autoloaded = true
-            autoloaded_dir = dir
-            added_entries = {}
-        end
-    end
-
-    local extensions = {}
-    if o.same_type then
-        if EXTENSIONS_VIDEO[string.lower(this_ext)] ~= nil then
-            extensions = EXTENSIONS_VIDEO
-        elseif EXTENSIONS_AUDIO[string.lower(this_ext)] ~= nil then
-            extensions = EXTENSIONS_AUDIO
-        else
-            extensions = EXTENSIONS_IMAGES
-        end
-    else
-        extensions = EXTENSIONS
+        autoloaded = true
    end

    local pl = mp.get_property_native("playlist", {})
@@ -255,22 +112,30 @@ function find_and_add_entries()
    msg.trace(("playlist-pos-1: %s, playlist: %s"):format(pl_current,
        utils.to_string(pl)))

-    local files = {}
-    do
-        local dir_mode = o.directory_mode or mp.get_property("directory-mode", "lazy")
-        local separator = mp.get_property_native("platform") == "windows" and "\\" or "/"
-        scan_dir(autoloaded_dir, path, dir_mode, separator, 0, files, extensions)
-    end
-
-    if next(files) == nil then
-        msg.debug("no other files or directories in directory")
+    local files = utils.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

    -- Find the current pl entry (dir+"/"+filename) in the sorted dir list
    local current
    for i = 1, #files do
-        if files[i] == path then
+        if files[i] == filename then
            current = i
            break
        end
@@ -280,49 +145,38 @@ function find_and_add_entries()
    end
    msg.trace("current file position in files: "..current)

-    -- treat already existing playlist entries, independent of how they got added
-    -- as if they got added by autoload
-    for _, entry in ipairs(pl) do
-        added_entries[entry.filename] = true
-    end
-
    local append = {[-1] = {}, [1] = {}}
    for direction = -1, 1, 2 do -- 2 iterations, with direction = -1 and +1
        for i = 1, MAXENTRIES do
-            local pos = current + i * direction
-            local file = files[pos]
+            local file = files[current + i * direction]
+            local pl_e = pl[pl_current + i * direction]
            if file == nil or file[1] == "." then
                break
            end

-            -- skip files that are/were already in the playlist
-            if not added_entries[file] then
-                if direction == -1 then
-                    msg.verbose("Prepending " .. file)
-                    table.insert(append[-1], 1, {file, pl_current + i * direction + 1})
-                else
-                    msg.verbose("Adding " .. file)
-                    if pl_count > 1 then
-                        table.insert(append[1], {file, pl_current + i * direction - 1})
-                    else
-                        mp.commandv("loadfile", file, "append")
-                    end
+            local filepath = dir .. file
+            if pl_e then
+                -- If there's a playlist entry, and it's the same file, stop.
+                msg.trace(pl_e.filename.." == "..filepath.." ?")
+                if pl_e.filename == filepath then
+                    break
                end
            end
-            added_entries[file] = true
-        end
-        if pl_count == 1 and direction == -1 and #append[-1] > 0 then
-            for i = 1, #append[-1] do
-                mp.commandv("loadfile", append[-1][i][1], "append")
+
+            if direction == -1 then
+                if pl_current == 1 then -- never add additional entries in the middle
+                    msg.info("Prepending " .. file)
+                    table.insert(append[-1], 1, filepath)
+                end
+            else
+                msg.info("Adding " .. file)
+                table.insert(append[1], filepath)
            end
-            mp.commandv("playlist-move", 0, current)
        end
    end

-    if pl_count > 1 then
-        add_files(append[1])
-        add_files(append[-1])
-    end
+    add_files_at(pl_current + 1, append[1])
+    add_files_at(pl_current, append[-1])
 end

 mp.register_event("start-file", find_and_add_entries)
@@ -1,124 +0,0 @@
-- Test script for some command API details.
-
-local utils = require("mp.utils")
-
-function join(sep, arr, count)
-    local r = ""
-    if count == nil then
-        count = #arr
-    end
-    for i = 1, count do
-        if i > 1 then
-            r = r .. sep
-        end
-        r = r .. utils.to_string(arr[i])
-    end
-    return r
-end
-
-mp.observe_property("vo-configured", "bool", function(_, v)
-    if v ~= true then
-        return
-    end
-
-    print("async expand-text")
-    mp.command_native_async({"expand-text", "hello ${path}!"},
-        function(res, val, err)
-            print("done async expand-text: " .. join(" ", {res, val, err}))
-        end)
-
-    -- make screenshot writing very slow
-    mp.set_property("screenshot-format", "png")
-    mp.set_property("screenshot-png-compression", "9")
-
-    timer = mp.add_periodic_timer(0.1, function() print("I'm alive") end)
-    timer:resume()
-
-    print("Slow screenshot command...")
-    res, err = mp.command_native({"screenshot"})
-    print("done, res: " .. utils.to_string(res))
-
-    print("Slow screenshot async command...")
-    res, err = mp.command_native_async({"screenshot"}, function(res)
-        print("done (async), res: " .. utils.to_string(res))
-        timer:kill()
-    end)
-    print("done (sending), res: " .. utils.to_string(res))
-
-    print("Broken screenshot async command...")
-    mp.command_native_async({"screenshot-to-file", "/nonexistent/bogus.png"},
-        function(res, val, err)
-            print("done err scr.: " .. join(" ", {res, val, err}))
-        end)
-
-    mp.command_native_async({name = "subprocess", args = {"sh", "-c", "echo hi && sleep 10s"}, capture_stdout = true},
-        function(res, val, err)
-            print("done subprocess: " .. join(" ", {res, val, err}))
-        end)
-
-    local x = mp.command_native_async({name = "subprocess", args = {"sleep", "inf"}},
-        function(res, val, err)
-            print("done sleep inf subprocess: " .. join(" ", {res, val, err}))
-        end)
-    mp.add_timeout(15, function()
-        print("aborting sleep inf subprocess after timeout")
-        mp.abort_async_command(x)
-    end)
-
-    -- (assuming this "freezes")
-    local y = mp.command_native_async({name = "sub-add", url = "-"},
-        function(res, val, err)
-            print("done sub-add stdin: " .. join(" ", {res, val, err}))
-        end)
-    mp.add_timeout(20, function()
-        print("aborting sub-add stdin after timeout")
-        mp.abort_async_command(y)
-    end)
-
-
-    mp.command_native_async({name = "subprocess", args = {"wc", "-c"},
-                             stdin_data = "hello", capture_stdout = true},
-        function(res, val, err)
-            print("Should be '5': " .. val.stdout)
-        end)
-    -- blocking stdin by default
-    mp.command_native_async({name = "subprocess", args = {"cat"},
-                             capture_stdout = true},
-        function(res, val, err)
-            print("Should be 0: " .. #val.stdout)
-        end)
-    -- stdin + detached
-    mp.command_native_async({name = "subprocess",
-                             args = {"bash", "-c", "(sleep 5s ; cat)"},
-                             stdin_data = "this should appear after 5s.\n",
-                             detach = true},
-        function(res, val, err)
-            print("5s test: " .. val.status)
-        end)
-
-    -- This should get killed on script exit.
-    mp.command_native_async({name = "subprocess", playback_only = false,
-                             args = {"sleep", "inf"}}, function()end)
-
-    -- Runs detached; should be killed on player exit (forces timeout)
-    mp.command_native({_flags={"async"}, name = "subprocess",
-                       playback_only = false, args = {"sleep", "inf"}})
-end)
-
-function freeze_test(playback_only)
-    -- This "freezes" the script, should be killed via timeout.
-    counter = counter and counter + 1 or 0
-    print("freeze! " .. counter)
-    local x = mp.command_native({name = "subprocess",
-                                 playback_only = playback_only,
-                                 args = {"sleep", "inf"}})
-    print("done, killed=" .. utils.to_string(x.killed_by_us))
-end
-
-mp.register_event("shutdown", function()
-    freeze_test(false)
-end)
-
-mp.register_event("idle", function()
-    freeze_test(true)
-end)
@@ -1,37 +0,0 @@
-- Test a float property which internally uses NaN.
-- Run with --no-config (or just scale-param1 not set).
-
-local utils = require 'mp.utils'
-
-prop_name = "scale-param1"
-
-- internal NaN, return string "default" instead of NaN
-v = mp.get_property_native(prop_name, "fail")
-print("Exp:", "string", "\"default\"")
-print("Got:", type(v), utils.to_string(v))
-
-v = mp.get_property(prop_name)
-print("Exp:", "default")
-print("Got:", v)
-
-- not representable -> return provided fallback value
-v = mp.get_property_number(prop_name, -100)
-print("Exp:", -100)
-print("Got:", v)
-
-mp.set_property_native(prop_name, 123)
-v = mp.get_property_number(prop_name, -100)
-print("Exp:", "number", 123)
-print("Got:", type(v), utils.to_string(v))
-
-- try to set an actual NaN
-st, msg = mp.set_property_number(prop_name, 0.0/0)
-print("Exp:", nil, "<message>")
-print("Got:", st, msg)
-
-- set default
-mp.set_property(prop_name, "default")
-
-v = mp.get_property(prop_name)
-print("Exp:", "default")
-print("Got:", v)
@@ -1,35 +0,0 @@
-local assdraw = require 'mp.assdraw'
-local utils = require 'mp.utils'
-
-things = {}
-for i = 1, 2 do
-    things[i] = {
-        osd1 = mp.create_osd_overlay("ass-events"),
-        osd2 = mp.create_osd_overlay("ass-events")
-    }
-end
-things[1].text = "{\\an5}hello\\Nworld"
-things[2].text = "{\\pos(400, 200)}something something"
-
-mp.add_periodic_timer(2, function()
-    for i, thing in ipairs(things) do
-        thing.osd1.data = thing.text
-        thing.osd1.compute_bounds = true
-        --thing.osd1.hidden = true
-        local res = thing.osd1:update()
-        print("res " .. i .. ": " .. utils.to_string(res))
-
-        thing.osd2.hidden = true
-        if res ~= nil and res.x0 ~= nil then
-            local draw = assdraw.ass_new()
-            draw:append("{\\alpha&H80}")
-            draw:draw_start()
-            draw:pos(0, 0)
-            draw:rect_cw(res.x0, res.y0, res.x1, res.y1)
-            draw:draw_stop()
-            thing.osd2.hidden = false
-            thing.osd2.data = draw.text
-        end
-        thing.osd2:update()
-    end
-end)
@@ -1,265 +0,0 @@
--[[
-
-Automatically skip in files if video frames with pre-supplied fingerprints are
-detected. This will skip ahead by a pre-configured amount of time if a matching
-video frame is detected.
-
-This requires the vf_fingerprint video filter to be compiled in. Read the
-documentation of this filter for caveats (which will automatically apply to
-this script as well), such as no support for zero-copy hardware decoding.
-
-You need to manually gather and provide fingerprints for video frames and add
-them to a configuration file in script-opts/skip-logo.conf (the "script-opts"
-directory must be in the mpv configuration directory, typically ~/.config/mpv/).
-
-Example script-opts/skip-logo.conf:
-
-
-    cases = {
-        {
-            -- Skip ahead 10 seconds if a black frame was detected
-            -- Note: this is dangerous non-sense. It's just for demonstration.
-            name = "black frame",   -- print if matched
-            skip = 10,              -- number of seconds to skip forward
-            score = 0.3,            -- required score
-            fingerprint = "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        },
-        {
-            -- Skip ahead 20 seconds if a white frame was detected
-            -- Note: this is dangerous non-sense. It's just for demonstration.
-            name = "fun2",
-            skip = 20,
-            fingerprint = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-        },
-    }
-
-This is actually a lua file. Lua was chosen because it seemed less of a pain to
-parse. Future versions of this script may change the format.
-
-The fingerprint is a video frame, converted to "gray" (8 bit per pixels), full
-range, each pixel concatenated into an array, converted to a hex string. You
-can produce these fingerprints by running this manually:
-
-   mpv --vf=fingerprint:print yourfile.mkv
-
-This will log the fingerprint of each video frame to the console, along with its
-timestamp. You find the fingerprint of a unique-enough looking frame, and add
-it as entry to skip-logo.conf.
-
-You can provide a score for "fuzziness". If no score is provided, a default
-value of 0.3 is used. The score is inverse: 0 means exactly the same, while a
-higher score means a higher difference. Currently, the score is computed as
-euclidean distance between the video frame and the pre-provided fingerprint,
-thus the highest score is 16. You probably want a score lower than 1 at least.
-(This algorithm is very primitive, but also simple and fast to compute.)
-
-There's always the danger of false positives, which might be quite annoying.
-It's up to you what you hate more, the logo, or random skips if false positives
-are detected. Also, it's always active, and might eat too much CPU with files
-that have a high resolution or framerate. To temporarily disable the script,
-having a keybind like this in your input.conf will be helpful:
-
-    ctrl+k vf toggle @skip-logo
-
-This will disable/enable the fingerprint filter, which the script automatically
-adds at start.
-
-Another important caveat is that the script currently disables matching during
-seeking or playback initialization, which means it cannot match the first few
-frames of a video. This could be fixed, but the author was too lazy to do so.
-
--]]
-
-local utils = require "mp.utils"
-local msg = require "mp.msg"
-
-local label = "skip-logo"
-local meta_property = string.format("vf-metadata/%s", label)
-
-local config = {}
-local cases = {}
-local cur_bmp
-local seeking = false
-local playback_start_pts = nil
-
-- Convert a  hex string to an array. Convert each byte to a [0,1] float by
-- interpreting it as normalized uint8_t.
-- The data parameter, if not nil, may be used as storage (avoiding garbage).
-local function hex_to_norm8(hex, data)
-    local size = math.floor(#hex / 2)
-    if #hex ~= size * 2 then
-        return nil
-    end
-    local res
-    if (data ~= nil) and (#data == size) then
-        res = data
-    else
-        res = {}
-    end
-    for i = 1, size do
-        local num = tonumber(hex:sub(i * 2, i * 2 + 1), 16)
-        if num == nil then
-            return nil
-        end
-        res[i] = num / 255.0
-    end
-    return res
-end
-
-local function compare_bmp(a, b)
-    if #a ~= #b then
-        return nil -- can't compare
-    end
-    local sum = 0
-    for i = 1, #a do
-        local diff = a[i] - b[i]
-        sum = sum + diff * diff
-    end
-    return math.sqrt(sum)
-end
-
-local function load_config()
-    local conf_file = mp.find_config_file("script-opts/skip-logo.conf")
-    local conf_fn
-    local err = nil
-    if conf_file then
-        if setfenv then
-            conf_fn, err = loadfile(conf_file)
-            if conf_fn then
-                setfenv(conf_fn, config)
-            end
-        else
-            conf_fn, err = loadfile(conf_file, "t", config)
-        end
-    else
-        err = "config file not found"
-    end
-
-    if conf_fn and (not err) then
-        local ok, err2 = pcall(conf_fn)
-        err = err2
-    end
-
-    if err then
-        msg.error("Failed to load config file:", err)
-    end
-
-    if config.cases then
-        for n, case in ipairs(config.cases) do
-            local err = nil
-            case.bitmap = hex_to_norm8(case.fingerprint)
-            if case.bitmap == nil then
-                err = "invalid or missing fingerprint field"
-            end
-            if case.score == nil then
-                case.score = 0.3
-            end
-            if type(case.score) ~= "number" then
-                err = "score field is not a number"
-            end
-            if type(case.skip) ~= "number" then
-                err = "skip field is not a number or missing"
-            end
-            if case.name == nil then
-                case.name = ("Entry %d"):format(n)
-            end
-            if err == nil then
-                cases[#cases + 1] = case
-            else
-                msg.error(("Entry %s: %s, ignoring."):format(case.name, err))
-            end
-        end
-    end
-end
-
-load_config()
-
-- Returns true on match and if something was done.
-local function check_fingerprint(hex, pts)
-    local bmp = hex_to_norm8(hex, cur_bmp)
-    cur_bmp = bmp
-
-    -- If parsing the filter's result failed (well, it shouldn't).
-    assert(bmp ~= nil, "filter returned nonsense")
-
-    for _, case in ipairs(cases) do
-        local score = compare_bmp(case.bitmap, bmp)
-        if (score ~= nil) and (score <= case.score) then
-            msg.warn(("Matching %s: score=%f (required: %f) at %s, skipping %f seconds"):
-                format(case.name, score, case.score, mp.format_time(pts), case.skip))
-            mp.commandv("seek", pts + case.skip, "absolute+exact")
-            return true
-        end
-    end
-
-    return false
-end
-
-local function read_frames()
-    local result = mp.get_property_native(meta_property)
-    if result == nil then
-        return
-    end
-
-    -- Try to get all entries. Out of laziness, assume that there are at most
-    -- 100 entries. (In fact, vf_fingerprint limits it to 10.)
-    for i = 0, 99 do
-        local prefix = string.format("fp%d.", i)
-        local hex = result[prefix .. "hex"]
-
-        local pts = tonumber(result[prefix .. "pts"])
-        if (hex == nil) or (pts == nil) then
-            break
-        end
-
-        local skip = false -- blame Lua for not having "continue" or "goto", not me
-
-        -- If seeking just stopped, there will be frames before the seek target,
-        -- ignore them by checking the timestamps.
-        if playback_start_pts ~= nil then
-            if pts >= playback_start_pts then
-                playback_start_pts = nil -- just for robustness
-            else
-                skip = true
-            end
-        end
-
-        if not skip then
-            if check_fingerprint(hex, pts) then
-                break
-            end
-        end
-    end
-end
-
-mp.observe_property(meta_property, "none", function()
-    -- Ignore frames that are decoded/filtered during seeking.
-    if seeking then
-        return
-    end
-
-    read_frames()
-end)
-
-mp.observe_property("seeking", "bool", function(name, val)
-    seeking = val
-    if seeking == false then
-        playback_start_pts = mp.get_property_number("playback-time")
-        read_frames()
-    end
-end)
-
-local filters = mp.get_property_native("option-info/vf/choices", {})
-local found = false
-for _, f in ipairs(filters) do
-    if f == "fingerprint" then
-        found = true
-        break
-    end
-end
-
-if found then
-    mp.command(("no-osd vf add @%s:fingerprint"):format(label, filter))
-else
-    msg.warn("vf_fingerprint not found")
-end
@@ -1,32 +0,0 @@
-local utils = require("mp.utils")
-
-function hardsleep()
-    os.execute("sleep 1s")
-end
-
-local hooks = {"on_before_start_file", "on_load", "on_load_fail",
-               "on_preloaded", "on_unload", "on_after_end_file"}
-
-for _, name in ipairs(hooks) do
-    mp.add_hook(name, 0, function()
-        print("--- hook: " .. name)
-        hardsleep()
-        print("    ... continue")
-    end)
-end
-
-local events = {"start-file", "end-file", "file-loaded", "seek",
-                "playback-restart", "idle", "shutdown"}
-for _, name in ipairs(events) do
-    mp.register_event(name, function()
-        print("--- event: " .. name)
-    end)
-end
-
-local props = {"path", "metadata"}
-for _, name in ipairs(props) do
-    mp.observe_property(name, "native", function(name, val)
-        print("property '" .. name .. "' changed to '" ..
-              utils.to_string(val) .. "'")
-    end)
-end
@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-
-# This checks for the sdk path, the sdk version, and
-# the sdk build version.
-
-import re
-import os
-import string
-import subprocess
-import sys
-from shutil import which
-from subprocess import check_output
-
-def find_macos_sdk():
-    sdk = os.environ.get('MACOS_SDK', '')
-    sdk_version = os.environ.get('MACOS_SDK_VERSION', '0.0')
-    xcrun = which('xcrun')
-    xcodebuild = which('xcodebuild')
-
-    if not xcrun:
-        return sdk,sdk_version
-
-    if not sdk:
-        sdk = check_output([xcrun, '--sdk', 'macosx', '--show-sdk-path'],
-                            encoding="UTF-8")
-
-    # find macOS SDK paths and version
-    if sdk_version == '0.0':
-        sdk_version = check_output([xcrun, '--sdk', 'macosx', '--show-sdk-version'],
-                                    encoding="UTF-8")
-
-        # use xcode tools when installed, still necessary for xcode versions <12.0
-        try:
-            sdk_version = check_output([xcodebuild, '-sdk', 'macosx', '-version', 'ProductVersion'],
-                                        encoding="UTF-8", stderr=subprocess.DEVNULL)
-        except:
-            pass
-
-    if not isinstance(sdk_version, str):
-        sdk_version = '10.10.0'
-
-    return sdk.strip(),sdk_version.strip()
-
-if __name__ == "__main__":
-    sdk_info = find_macos_sdk()
-    sys.stdout.write(','.join(sdk_info))
@@ -1,42 +0,0 @@
-#!/usr/bin/env python3
-
-# Finds the macos swift library directory and prints the full path to stdout.
-# First argument is the path to the swift executable.
-
-import os
-import sys
-from shutil import which
-from subprocess import check_output
-
-def find_swift_lib():
-    swift_lib_dir = os.environ.get('SWIFT_LIB_DYNAMIC', '')
-    if swift_lib_dir:
-        return swift_lib_dir
-
-    # first check for lib dir relative to swift executable
-    xcode_dir = os.path.dirname(os.path.dirname(sys.argv[1]))
-    swift_lib_dir = os.path.join(xcode_dir, "lib", "swift", "macosx")
-
-    if os.path.isdir(swift_lib_dir):
-        return swift_lib_dir
-
-    # fallback to xcode-select path
-    xcode_select = which("xcode-select")
-    if not xcode_select:
-        sys.exit(1)
-
-    xcode_path = check_output([xcode_select, "-p"], encoding="UTF-8")
-
-    swift_lib_dir = os.path.join(xcode_path, "Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx")
-    if os.path.isdir(swift_lib_dir):
-        return swift_lib_dir
-
-    # last resort if we still haven't found a path
-    swift_lib_dir = os.path.join(xcode_path, "usr/lib/swift/macosx")
-    if not os.path.isdir(swift_lib_dir):
-        sys.exit(1)
-    return swift_lib_dir
-
-if __name__ == "__main__":
-    swift_lib_dir = find_swift_lib()
-    sys.stdout.write(swift_lib_dir)
@@ -21,6 +21,8 @@ Can also be used to directly parse Matroska files and display their contents.
 # 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', (
@@ -105,10 +107,6 @@ elements_matroska = (
                    'DisplayWidth, 54b0, uint',
                    'DisplayHeight, 54ba, uint',
                    'DisplayUnit, 54b2, uint',
-                    'PixelCropTop, 54bb, uint',
-                    'PixelCropLeft, 54cc, uint',
-                    'PixelCropRight, 54dd, uint',
-                    'PixelCropBottom, 54aa, uint',
                    'FrameRate, 2383e3, float',
                    'ColourSpace, 2eb524, binary',
                    'StereoMode, 53b8, uint',
@@ -278,7 +276,7 @@ class MatroskaElement(object):

    def add_subelements(self, subelements):
        self.subelements = subelements
-        self.subids = {x[0].elid for x in subelements}
+        self.subids = set(x[0].elid for x in subelements)

 elementd = {}
 elementlist = []
@@ -302,8 +300,8 @@ parse_elems(elements_ebml, 'EBML')
 parse_elems(elements_matroska, 'MATROSKA')

 def printf(out, *args):
-    out.write(' '.join(str(x) for x in args))
-    out.write('\n')
+    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')
@@ -464,10 +462,12 @@ if __name__ == "__main__":
        parse_one(s, 0, None, 1 << 63)

    if sys.argv[1] == '--generate-header':
-        generate_C_header(open(sys.argv[2], "w"))
+        generate_C_header(sys.stdout)
    elif sys.argv[1] == '--generate-definitions':
-        generate_C_definitions(open(sys.argv[2], "w"))
+        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()
@@ -22,7 +22,7 @@ OS2Version: 3
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 0
 CreationTime: 1408646554
-ModificationTime: 1576096543
+ModificationTime: 1492879730
 PfmFamily: 81
 TTFWeight: 400
 TTFWidth: 5
@@ -1,15 +0,0 @@
-StartChar: uniE112
-Encoding: 57618 57618 30
-Width: 768
-VWidth: 1176
-Flags: HW
-LayerCount: 2
-Fore
-SplineSet
-512 40 m 1
- 0 40 l 1
- 0 168 l 1
- 512 168 l 1
- 512 40 l 1
-EndSplineSet
-EndChar
@@ -1,20 +0,0 @@
-StartChar: uniE113
-Encoding: 57619 57619 31
-Width: 622
-VWidth: 1178
-Flags: HW
-LayerCount: 2
-Fore
-SplineSet
-768 42 m 5
- 0 42 l 5
- 0 746 l 5
- 768 746 l 5
- 768 42 l 5
-704 106 m 5
- 704 618 l 5
- 64 618 l 5
- 64 106 l 5
- 704 106 l 5
-EndSplineSet
-EndChar
@@ -1,31 +0,0 @@
-StartChar: uniE114
-Encoding: 57620 57620 32
-Width: 896
-VWidth: 1178
-Flags: HW
-LayerCount: 2
-Fore
-SplineSet
-768 298 m 1
- 576 298 l 1
- 576 42 l 1
- 0 42 l 1
- 0 490 l 1
- 192 490 l 1
- 192 746 l 1
- 768 746 l 1
- 768 298 l 1
-704 362 m 1
- 704 618 l 1
- 256 618 l 1
- 256 490 l 1
- 576 490 l 1
- 576 362 l 1
- 704 362 l 1
-512 106 m 1
- 512 362 l 1
- 64 362 l 1
- 64 106 l 1
- 512 106 l 1
-EndSplineSet
-EndChar
@@ -1,27 +0,0 @@
-StartChar: uniE115
-Encoding: 57621 57621 33
-Width: 844
-VWidth: 1112
-Flags: HW
-LayerCount: 2
-Fore
-SplineSet
-671 40 m 1
- 575 40 l 1
- 335 277 l 1
- 98 40 l 1
- -1 40 l 1
- -1 136 l 1
- 236 376 l 1
- -1 613 l 1
- -1 712 l 1
- 98 712 l 1
- 335 475 l 1
- 575 712 l 1
- 671 712 l 1
- 671 613 l 1
- 434 376 l 1
- 671 139 l 1
- 671 40 l 1
-EndSplineSet
-EndChar
@@ -79,7 +79,7 @@ EOF
        video-bitrate
        video-codec
        video-format
-        video-params/aspect
+        video-aspect
        container-fps
        width
        height
@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+
 import os
 import shutil
 import sys
@@ -6,7 +7,7 @@ import fileinput
 from optparse import OptionParser

 def sh(command):
-    return os.popen(command).read().strip()
+    return os.popen(command).read()

 def bundle_path(binary_name):
    return "%s.app" % binary_name
@@ -36,10 +37,11 @@ def copy_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))
+        print (line.rstrip().replace('${VERSION}', version))

-def sign_bundle(binary_name):
-    sh('codesign --force --deep -s - ' + bundle_path(binary_name))
+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'):
@@ -71,15 +73,14 @@ 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)

    if options.deps:
        print("> bundling dependencies")
-        print(sh(" ".join(["TOOLS/dylib-unhell.py", target_binary(binary_name)])))
-
-    print("> signing bundle with ad-hoc pseudo identity")
-    sign_bundle(binary_name)
+        sh(" ".join(["TOOLS/dylib-unhell.py", target_binary(binary_name)]))

    print("done.")

@@ -1,8 +0,0 @@
-input = join_paths(source_root, 'TOOLS', 'osxbundle',
-                   'mpv.app', 'Contents', 'Resources', 'icon.icns')
-osxbundle = custom_target('osxbundle',
-    input: input,
-    output: 'icon.icns.inc',
-    command: [file2string, '@INPUT@', '@OUTPUT@'],
-)
-sources += osxbundle
@@ -173,7 +173,7 @@
      </dict>
    </array>
    <key>CFBundleExecutable</key>
-    <string>mpv</string>
+    <string>mpv-bundle</string>
    <key>CFBundleIconFile</key>
    <string>icon</string>
    <key>CFBundleIdentifier</key>
@@ -188,13 +188,6 @@
    <string>${VERSION}</string>
    <key>NSHighResolutionCapable</key>
    <true/>
-    <key>LSEnvironment</key>
-    <dict>
-      <key>MallocNanoZone</key>
-      <string>0</string>
-      <key>MPVBUNDLE</key>
-      <string>true</string>
-    </dict>
    <key>CFBundleURLTypes</key>
    <array>
      <dict>
@@ -224,8 +217,6 @@
          <string>ftp</string>
          <string>udp</string>
          <string>smb</string>
-          <string>srt</string>
-          <string>rist</string>
        </array>
      </dict>
      <dict>
@@ -1,2 +1 @@
 player-operation-mode=pseudo-gui
-log-file=~/Library/Logs/mpv.log
@@ -147,8 +147,8 @@ if hasval:
    ax[1] = win.addPlot()
    ax[1].setXLink(ax[0])
 for cur in ax:
-    if cur is not None:
-        cur.addLegend(offset = (-1, 1))
+   if cur is not None:
+       cur.addLegend(offset = (-1, 1))
 for e in G.sevents:
    cur = ax[1 if e.type == "value" else 0]
    if not cur in G.curveno:
@@ -0,0 +1,139 @@
+#!/usr/bin/ruby
+
+class TravisDepsBuilder
+  def self.make(name)
+    instance = klass.new(name)
+    instance.fill_data
+    instance.deps
+    instance.build
+  end
+
+  def self.klass
+    Module.const_get([self.name, self.os.capitalize].join)
+  rescue NameError
+    self
+  end
+
+  def self.os
+    ENV['TRAVIS_OS_NAME']
+  end
+
+  attr_reader :name, :url, :action, :os
+
+  def initialize(name)
+    @name, @os = name, self.class.os
+  end
+
+  def fill_data
+    data = build_map.fetch(name)
+    @url, @action = data[:url], data[:action]
+  end
+
+  def build
+    send(action)
+  end
+
+  def deps; end
+
+  private
+  def package_manager_update
+    # yes class variable, you wanna update only once across all instances
+    @@updated ||= false
+    return if @@updated
+    sh({'linux' => 'sudo apt-get update -y', 'osx' => 'brew update'}[os])
+    @@updated = true
+  end
+
+  def package_install(*packages)
+    cmd = {
+      'linux' => 'sudo apt-get install %s -y',
+      'osx'   => 'brew install %s'
+    }[os] % [packages.join(" ")]
+
+    sh cmd
+  end
+
+  def git
+    sh "git clone --depth=1 #{url} #{name}"
+    compile name
+  end
+
+  def stable
+    filename = File.basename(url)
+    sh "wget #{url}"
+    sh "tar -xzvf #{filename}"
+    dirname  = File.basename(url, ".tar.gz"  )
+    compile dirname
+  end
+
+  def package
+    package_install(url)
+  end
+
+  def compile(dirname)
+    sh "cd #{dirname} && #{configure} && make && sudo make install"
+    sh "cd $TRAVIS_BUILD_DIR"
+  end
+
+  def configure
+    "./configure"
+  end
+
+  def sh(command)
+    `#{command}`
+  end
+end
+
+class Libav < TravisDepsBuilder
+  def build_map
+    {
+      "libav-git" => {
+        :action => :git,
+        :url    => "git://git.libav.org/libav.git"
+      },
+      "ffmpeg-git" => {
+        :action => :git,
+        :url    => "https://github.com/FFmpeg/FFmpeg.git"
+      }
+    }
+  end
+
+  def configure
+    [super, "--cc=#{ENV['CC']} --disable-asm"].join(" ")
+  end
+end
+
+class LibavOsx < Libav
+  def build_map
+    {
+      "ffmpeg-git" => { :action => :package, :url => 'ffmpeg' },
+    }
+  end
+end
+
+class Libass < TravisDepsBuilder
+  def build_map
+    {
+      "libass-stable" => {
+        :action => :stable,
+        :url    => 'https://github.com/libass/libass/releases/download/0.12.1/libass-0.12.1.tar.gz'
+      }
+    }
+  end
+end
+
+class Dependencies < TravisDepsBuilder
+  def deps
+    packages = {
+      'linux' => 'pkg-config fontconfig libfribidi-dev yasm libxinerama-dev libxrandr-dev',
+      'osx'   => 'pkg-config fontconfig freetype fribidi yasm'
+    }
+    package_manager_update
+    package_install(packages.fetch(os))
+  end
+end
+
+Dependencies.new(:deps).deps
+
+Libass.make(ARGV[0])
+Libav.make(ARGV[1])
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+if [ "x$LIBAV" != "xffmpeg-git" ] || [ "x$TRAVIS_OS_NAME" != "xlinux" ]; then
+  # trigger build only on one of the matrix nodes
+  exit;
+fi
+
+if [ "x$TRAVIS_BRANCH" != "xmaster" ]; then
+  # only rebuild website with pushes to master
+  exit;
+fi
+
+TRAVIS_COMMIT_RANGE=${TRAVIS_COMMIT_RANGE:-HEAD^..}
+if git diff --quiet --name-only --exit-code "$TRAVIS_COMMIT_RANGE" DOCS/ VERSION; then
+  exit;
+fi
+
+body='{
+"request": {
+  "branch":"master"
+}}'
+
+curl -s -X POST \
+-H "Content-Type: application/json" \
+-H "Accept: application/json" \
+-H "Travis-API-Version: 3" \
+-H "Authorization: token $WEBSITE_TRAVIS_TOKEN" \
+-d "$body" \
+https://api.travis-ci.org/repo/mpv-player%2Fmpv.io/requests
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python

 """
 This script emulates "unique application" functionality on Linux. When starting
@@ -19,6 +19,10 @@ will typically just fill ~/.xsession-errors with garbage.
 mpv will terminate if there are no more files to play, and running the umpv
 script after that will start a new mpv instance.

+Note that you can control the mpv instance by writing to the command fifo:
+
+    echo "cycle fullscreen" > ~/.umpv_fifo
+
 Note: you can supply custom mpv path and options with the MPV environment
      variable. The environment variable will be split on whitespace, and the
      first item is used as path to mpv binary and the rest is passed as options
@@ -28,11 +32,11 @@ Note: you can supply custom mpv path and options with the MPV environment

 import sys
 import os
-import socket
 import errno
 import subprocess
+import fcntl
+import stat
 import string
-import shlex

 files = sys.argv[1:]

@@ -51,36 +55,42 @@ def make_abs(filename):
    if not is_url(filename):
        return os.path.abspath(filename)
    return filename
-files = (make_abs(f) for f in files)
+files = [make_abs(f) for f in files]

-SOCK = os.path.join(os.getenv("XDG_RUNTIME_DIR", os.getenv("HOME")), ".umpv_socket")
+FIFO = os.path.join(os.getenv("HOME"), ".umpv_fifo")

-sock = None
+fifo_fd = -1
 try:
-    sock = socket.socket(socket.AF_UNIX)
-    sock.connect(SOCK)
-except socket.error as e:
-    if e.errno == errno.ECONNREFUSED:
-        sock = None
-        pass  # abandoned socket
+    fifo_fd = os.open(FIFO, os.O_NONBLOCK | os.O_WRONLY)
+except OSError as e:
+    if e.errno == errno.ENXIO:
+        pass  # pipe has no writer
    elif e.errno == errno.ENOENT:
-        sock = None
        pass # doesn't exist
    else:
        raise e

-if sock:
+if fifo_fd >= 0:
    # Unhandled race condition: what if mpv is terminating right now?
+    fcntl.fcntl(fifo_fd, fcntl.F_SETFL, 0) # set blocking mode
+    fifo = os.fdopen(fifo_fd, "w")
    for f in files:
        # escape: \ \n "
        f = f.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n")
        f = "\"" + f + "\""
-        sock.send(("raw loadfile " + f + " append\n").encode("utf-8"))
+        fifo.write("raw loadfile " + f + " append\n")
 else:
-    # Let mpv recreate socket if it doesn't already exist.
+    # Recreate pipe if it doesn't already exist.
+    # Also makes sure it's safe, and no other user can create a bogus pipe
+    # that breaks security.
+    try:
+        os.unlink(FIFO)
+    except OSError as e:
+        pass
+    os.mkfifo(FIFO, 0o600)

-    opts = shlex.split(os.getenv("MPV") or "mpv")
-    opts.extend(["--no-terminal", "--force-window", "--input-ipc-server=" + SOCK,
+    opts = (os.getenv("MPV") or "mpv").split()
+    opts.extend(["--no-terminal", "--force-window", "--input-file=" + FIFO,
                 "--"])
    opts.extend(files)

@@ -0,0 +1,283 @@
+#!/usr/bin/perl
+
+# Generate ZSH completion
+
+#
+# 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/>.
+#
+
+use strict;
+use warnings;
+use warnings FATAL => 'uninitialized';
+
+my $mpv = $ARGV[0] || 'mpv';
+
+my @opts = parse_main_opts('--list-options', '^ (\-\-[^\s\*]*)\*?\s*(.*)');
+
+die "Couldn't find any options" unless (@opts);
+
+my @ao = parse_opts('--ao=help', '^  ([^\s\:]*)\s*(.*)');
+my @vo = parse_opts('--vo=help', '^  ([^\s\:]*)\s*(.*)');
+
+my @af = parse_opts('--af=help', '^  ([^\s\:]*)\s*(.*)');
+my @vf = parse_opts('--vf=help', '^  ([^\s\:]*)\s*(.*)');
+
+my @protos = parse_opts('--list-protocols', '^ ([^\s]*)');
+
+my ($opts_str, $ao_str, $vo_str, $af_str, $vf_str, $protos_str);
+
+$opts_str .= qq{  '$_' \\\n} foreach (@opts);
+chomp $opts_str;
+
+$ao_str .= qq{      '$_' \\\n} foreach (@ao);
+chomp $ao_str;
+
+$vo_str .= qq{      '$_' \\\n} foreach (@vo);
+chomp $vo_str;
+
+$af_str .= qq{      '$_' \\\n} foreach (@af);
+chomp $af_str;
+
+$vf_str .= qq{      '$_' \\\n} foreach (@vf);
+chomp $vf_str;
+
+$protos_str = join(' ', @protos);
+
+my $runtime_completions = <<'EOS';
+  profile|show-profile)
+    local -a profiles
+    local current
+    for current in "${(@f)$($words[1] --profile=help)}"; do
+      current=${current//\*/\\\*}
+      current=${current//\:/\\\:}
+      current=${current//\[/\\\[}
+      current=${current//\]/\\\]}
+      if [[ $current =~ $'\t'([^$'\t']*)$'\t'(.*) ]]; then
+        if [[ -n $match[2] ]]; then
+          current="$match[1][$match[2]]"
+        else
+          current="$match[1]"
+        fi
+        profiles=($profiles $current)
+      fi
+    done
+    if [[ $state == show-profile ]]; then
+      # For --show-profile, only one allowed
+      if (( ${#profiles} > 0 )); then
+        _values 'profile' $profiles && rc=0
+      fi
+    else
+      # For --profile, multiple allowed
+      profiles=($profiles 'help[list profiles]')
+      _values -s , 'profile(s)' $profiles && rc=0
+    fi
+  ;;
+
+  audio-device)
+    local -a audio_devices
+    local current
+    for current in "${(@f)$($words[1] --audio-device=help)}"; do
+      current=${current//\*/\\\*}
+      current=${current//\:/\\\:}
+      current=${current//\[/\\\[}
+      current=${current//\]/\\\]}
+      if [[ $current =~ '  '\'([^\']*)\'' \('(.*)'\)' ]]; then
+        audio_devices=($audio_devices "$match[1][$match[2]]")
+      fi
+    done
+    audio_devices=($audio_devices 'help[list audio devices]')
+    _values 'audio device' $audio_devices && rc=0
+  ;;
+EOS
+chomp $runtime_completions;
+
+my $tmpl = <<"EOS";
+#compdef mpv
+
+# For customization, see:
+#  https://github.com/mpv-player/mpv/wiki/Zsh-completion-customization
+
+local curcontext="\$curcontext" state state_descr line
+typeset -A opt_args
+
+local -a match mbegin mend
+local MATCH MBEGIN MEND
+
+# By default, don't complete URLs unless no files match
+local -a tag_order
+zstyle -a ":completion:*:*:\$service:*" tag-order tag_order || \
+  zstyle  ":completion:*:*:\$service:*" tag-order '!urls'
+
+local rc=1
+
+_arguments -C -S \\
+$opts_str
+  '*:files:->mfiles' && rc=0
+
+case \$state in
+  ao)
+    _values -s , 'audio outputs' \\
+$ao_str
+    && rc=0
+  ;;
+
+  vo)
+    _values -s , 'video outputs' \\
+$vo_str
+    && rc=0
+  ;;
+
+  af)
+    _values -s , 'audio filters' \\
+$af_str
+    && rc=0
+  ;;
+
+  vf)
+    _values -s , 'video filters' \\
+$vf_str
+    && rc=0
+  ;;
+
+$runtime_completions
+
+  files)
+    compset -P '*,'
+    compset -S ',*'
+    _files -r ',/ \\t\\n\\-' && rc=0
+  ;;
+
+  mfiles)
+    local expl
+    _tags files urls
+    while _tags; do
+      _requested files expl 'media file' _files && rc=0
+      if _requested urls; then
+        while _next_label urls expl URL; do
+          _urls "\$expl[@]" && rc=0
+          compadd -S '' "\$expl[@]" $protos_str && rc=0
+        done
+      fi
+      (( rc )) || return 0
+    done
+  ;;
+esac
+
+return rc
+EOS
+
+print $tmpl;
+
+sub parse_main_opts {
+    my ($cmd, $regex) = @_;
+
+    my @list;
+    my @lines = call_mpv($cmd);
+
+    foreach my $line (@lines) {
+        my ($name, $desc) = ($line =~ /^$regex/) or next;
+
+        next if ($desc eq 'removed' || $desc eq 'alias');
+
+        if ($desc =~ /^Flag/) {
+
+            push @list, $name;
+
+            $name =~ /^--(.*)/;
+            if ($1 !~ /^(\{|\}|v|list-options|really-quiet|no-.*)$/) {
+                push @list, "--no-$1";
+            }
+
+        } elsif ($desc =~ /^Print/) {
+
+            push @list, $name;
+
+        } else {
+
+            # Option takes argument
+
+            my $entry = $name;
+
+            $desc =~ s/\:/\\:/g;
+            $entry .= "=-:$desc:";
+
+            if ($desc =~ /^Choices\\: ([^(]*)/) {
+                my $choices = $1;
+                $choices =~ s/ +$//; # strip trailing space
+                $entry .= "($choices)";
+
+                # If "no" is one of the choices, it can also be
+                # negated like a flag (--no-whatever).
+                if ($choices =~ /\bno\b/) {
+                    $name =~ s/^--/--no-/;
+                    push @list, $name;
+                }
+            } elsif ($line =~ /\[file\]/) {
+                $entry .= '->files';
+            } elsif ($name =~ /^--(ao|vo|af|vf|profile|show-profile|audio-device)$/) {
+                $entry .= "->$1";
+            }
+            push @list, $entry;
+        }
+    }
+
+    # Sort longest first, because zsh won't complete an option listed
+    # after one that's a prefix of it.
+    @list = sort {
+        $a =~ /([^=]*)/; my $ma = $1;
+        $b =~ /([^=]*)/; my $mb = $1;
+
+        length($mb) <=> length($ma)
+    } @list;
+
+    return @list;
+}
+
+sub parse_opts {
+    my ($cmd, $regex) = @_;
+
+    my @list;
+    my @lines = call_mpv($cmd);
+
+    foreach my $line (@lines) {
+        if ($line !~ /^$regex/) {
+            next;
+        }
+
+        my $entry = $1;
+
+        if (defined $2) {
+            my $desc = $2;
+            $desc =~ s/\:/\\:/g;
+            $entry .= "[$desc]";
+        }
+
+        push @list, $entry
+    }
+
+    return @list;
+}
+
+sub call_mpv {
+    my ($cmd) = @_;
+    my $output = `"$mpv" --no-config $cmd`;
+    if ($? == -1) {
+        die "Could not run mpv: $!";
+    } elsif ((my $exit_code = $? >> 8) != 0) {
+        die "mpv returned $exit_code with output:\n$output";
+    }
+    return split /\n/, $output;
+}
@@ -1 +1 @@
-0.37.0
+0.29.1
@@ -0,0 +1,32 @@
+branches:
+  only:
+    - master
+    - appveyor
+    - ci
+
+environment:
+  global:
+    PATH: C:\msys64\usr\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem
+  matrix:
+    - MSYSTEM: MINGW64
+    - MSYSTEM: MINGW32
+
+shallow_clone: true
+test: off
+
+install:
+  # Update core packages
+  - C:\msys64\usr\bin\pacman -Syyuu --noconfirm --noprogressbar --ask=20
+  # Update non-core packages
+  - C:\msys64\usr\bin\pacman -Suu --noconfirm --noprogressbar --ask=20
+  # Install required MSYS2 packages
+  - C:\msys64\usr\bin\pacman -S --noconfirm --noprogressbar --needed base-devel perl python pkg-config
+  # Now MSYS2 is up to date, do the rest of the install from a bash script
+  - C:\msys64\usr\bin\bash -lc "cd && exec \"$APPVEYOR_BUILD_FOLDER\"/TOOLS/appveyor-install.sh"
+build_script:
+  - C:\msys64\usr\bin\bash -lc "cd \"$APPVEYOR_BUILD_FOLDER\" && exec ./TOOLS/appveyor-build.sh"
+on_failure:
+  - type "%APPVEYOR_BUILD_FOLDER%\build\config.log"
+
+cache:
+  - C:\msys64\var\cache\pacman\pkg
@@ -18,12 +18,9 @@
 #include <libavutil/frame.h>
 #include <libavutil/mem.h>

-#include "config.h"
-
 #include "common/common.h"

 #include "chmap.h"
-#include "chmap_avchannel.h"
 #include "fmt-conversion.h"
 #include "format.h"
 #include "aframe.h"
@@ -52,7 +49,8 @@ struct mp_aframe *mp_aframe_create(void)
 {
    struct mp_aframe *frame = talloc_zero(NULL, struct mp_aframe);
    frame->av_frame = av_frame_alloc();
-    MP_HANDLE_OOM(frame->av_frame);
+    if (!frame->av_frame)
+        abort();
    talloc_set_destructor(frame, free_frame);
    mp_aframe_reset(frame);
    return frame;
@@ -102,19 +100,6 @@ void mp_aframe_unref_data(struct mp_aframe *frame)
    talloc_free(tmp);
 }

-// Allocate this much data. Returns false for failure (data already allocated,
-// invalid sample count or format, allocation failures).
-// Normally you're supposed to use a frame pool and mp_aframe_pool_allocate().
-bool mp_aframe_alloc_data(struct mp_aframe *frame, int samples)
-{
-    if (mp_aframe_is_allocated(frame))
-        return false;
-    struct mp_aframe_pool *p = mp_aframe_pool_create(NULL);
-    int r = mp_aframe_pool_allocate(p, frame, samples);
-    talloc_free(p);
-    return r >= 0;
-}
-
 // Return a new reference to the data in av_frame. av_frame itself is not
 // touched. Returns NULL if not representable, or if input is NULL.
 // Does not copy the timestamps.
@@ -123,16 +108,6 @@ struct mp_aframe *mp_aframe_from_avframe(struct AVFrame *av_frame)
    if (!av_frame || av_frame->width > 0 || av_frame->height > 0)
        return NULL;

-#if HAVE_AV_CHANNEL_LAYOUT
-    if (!av_channel_layout_check(&av_frame->ch_layout))
-        return NULL;
-
-    struct mp_chmap converted_map = { 0 };
-    if (!mp_chmap_from_av_layout(&converted_map, &av_frame->ch_layout)) {
-        return NULL;
-    }
-#endif
-
    int format = af_from_avformat(av_frame->format);
    if (!format && av_frame->format != AV_SAMPLE_FMT_NONE)
        return NULL;
@@ -144,14 +119,12 @@ struct mp_aframe *mp_aframe_from_avframe(struct AVFrame *av_frame)
        abort();

    frame->format = format;
-#if !HAVE_AV_CHANNEL_LAYOUT
    mp_chmap_from_lavc(&frame->chmap, frame->av_frame->channel_layout);

+#if LIBAVUTIL_VERSION_MICRO >= 100
    // FFmpeg being a stupid POS again
    if (frame->chmap.num != frame->av_frame->channels)
        mp_chmap_from_channels(&frame->chmap, av_frame->channels);
-#else
-    frame->chmap = converted_map;
 #endif

    if (av_frame->opaque_ref) {
@@ -220,15 +193,10 @@ void mp_aframe_config_copy(struct mp_aframe *dst, struct mp_aframe *src)

    dst->av_frame->sample_rate = src->av_frame->sample_rate;
    dst->av_frame->format = src->av_frame->format;
-
-#if !HAVE_AV_CHANNEL_LAYOUT
    dst->av_frame->channel_layout = src->av_frame->channel_layout;
+#if LIBAVUTIL_VERSION_MICRO >= 100
    // FFmpeg being a stupid POS again
    dst->av_frame->channels = src->av_frame->channels;
-#else
-    if (av_channel_layout_copy(&dst->av_frame->ch_layout,
-                               &src->av_frame->ch_layout) < 0)
-        abort();
 #endif
 }

@@ -338,20 +306,14 @@ bool mp_aframe_set_chmap(struct mp_aframe *frame, struct mp_chmap *in)
        return false;
    if (mp_aframe_is_allocated(frame) && in->num != frame->chmap.num)
        return false;
-
-#if !HAVE_AV_CHANNEL_LAYOUT
    uint64_t lavc_layout = mp_chmap_to_lavc_unchecked(in);
    if (!lavc_layout && in->num)
        return false;
-#endif
    frame->chmap = *in;
-
-#if !HAVE_AV_CHANNEL_LAYOUT
    frame->av_frame->channel_layout = lavc_layout;
+#if LIBAVUTIL_VERSION_MICRO >= 100
    // FFmpeg being a stupid POS again
    frame->av_frame->channels = frame->chmap.num;
-#else
-    mp_chmap_to_av_layout(&frame->av_frame->ch_layout, in);
 #endif
    return true;
 }
@@ -448,16 +410,10 @@ void mp_aframe_skip_samples(struct mp_aframe *f, int samples)
 {
    assert(samples >= 0 && samples <= mp_aframe_get_size(f));

-    if (av_frame_make_writable(f->av_frame) < 0)
-        return; // go complain to ffmpeg
-
    int num_planes = mp_aframe_get_planes(f);
    size_t sstride = mp_aframe_get_sstride(f);
-    for (int n = 0; n < num_planes; n++) {
-        memmove(f->av_frame->extended_data[n],
-                f->av_frame->extended_data[n] + samples * sstride,
-                (f->av_frame->nb_samples - samples) * sstride);
-    }
+    for (int n = 0; n < num_planes; n++)
+        f->av_frame->extended_data[n] += samples * sstride;

    f->av_frame->nb_samples -= samples;

@@ -465,37 +421,6 @@ void mp_aframe_skip_samples(struct mp_aframe *f, int samples)
        f->pts += samples / mp_aframe_get_effective_rate(f);
 }

-// sanitize a floating point sample value
-#define sanitizef(f) do {       \
-    if (!isnormal(f))           \
-        (f) = 0;                \
-} while (0)
-
-void mp_aframe_sanitize_float(struct mp_aframe *mpa)
-{
-    int format = af_fmt_from_planar(mp_aframe_get_format(mpa));
-    if (format != AF_FORMAT_FLOAT && format != AF_FORMAT_DOUBLE)
-        return;
-    int num_planes = mp_aframe_get_planes(mpa);
-    uint8_t **planes = mp_aframe_get_data_rw(mpa);
-    if (!planes)
-        return;
-    for (int p = 0; p < num_planes; p++) {
-        void *ptr = planes[p];
-        int total = mp_aframe_get_total_plane_samples(mpa);
-        switch (format) {
-        case AF_FORMAT_FLOAT:
-            for (int s = 0; s < total; s++)
-                sanitizef(((float *)ptr)[s]);
-            break;
-        case AF_FORMAT_DOUBLE:
-            for (int s = 0; s < total; s++)
-                sanitizef(((double *)ptr)[s]);
-            break;
-        }
-    }
-}
-
 // Return the timestamp of the sample just after the end of this frame.
 double mp_aframe_end_pts(struct mp_aframe *f)
 {
@@ -523,13 +448,13 @@ void mp_aframe_clip_timestamps(struct mp_aframe *f, double start, double end)
    double rate = mp_aframe_get_effective_rate(f);
    if (f_end == MP_NOPTS_VALUE)
        return;
+    if (af_fmt_is_spdif(mp_aframe_get_format(f)))
+        return;
    if (end != MP_NOPTS_VALUE) {
        if (f_end >= end) {
            if (f->pts >= end) {
                f->av_frame->nb_samples = 0;
            } else {
-                if (af_fmt_is_spdif(mp_aframe_get_format(f)))
-                    return;
                int new = (end - f->pts) * rate;
                f->av_frame->nb_samples = MPCLAMP(new, 0, f->av_frame->nb_samples);
            }
@@ -541,8 +466,6 @@ void mp_aframe_clip_timestamps(struct mp_aframe *f, double start, double end)
                f->av_frame->nb_samples = 0;
                f->pts = f_end;
            } else {
-                if (af_fmt_is_spdif(mp_aframe_get_format(f)))
-                    return;
                int skip = (start - f->pts) * rate;
                skip = MPCLAMP(skip, 0, f->av_frame->nb_samples);
                mp_aframe_skip_samples(f, skip);
@@ -597,56 +520,6 @@ bool mp_aframe_set_silence(struct mp_aframe *f, int offset, int samples)
    return true;
 }

-bool mp_aframe_reverse(struct mp_aframe *f)
-{
-    int format = mp_aframe_get_format(f);
-    size_t bps = af_fmt_to_bytes(format);
-    if (!af_fmt_is_pcm(format) || bps > 16)
-        return false;
-
-    uint8_t **d = mp_aframe_get_data_rw(f);
-    if (!d)
-        return false;
-
-    int planes = mp_aframe_get_planes(f);
-    int samples = mp_aframe_get_size(f);
-    int channels = mp_aframe_get_channels(f);
-    size_t sstride = mp_aframe_get_sstride(f);
-
-    int plane_samples = channels;
-    if (af_fmt_is_planar(format))
-        plane_samples = 1;
-
-    for (int p = 0; p < planes; p++) {
-        for (int n = 0; n < samples / 2; n++) {
-            int s1_offset = n * sstride;
-            int s2_offset = (samples - 1 - n) * sstride;
-            for (int c = 0; c < plane_samples; c++) {
-                // Nobody said it'd be fast.
-                char tmp[16];
-                uint8_t *s1 = d[p] + s1_offset + c * bps;
-                uint8_t *s2 = d[p] + s2_offset + c * bps;
-                memcpy(tmp, s2, bps);
-                memcpy(s2, s1, bps);
-                memcpy(s1, tmp, bps);
-            }
-        }
-    }
-
-    return true;
-}
-
-int mp_aframe_approx_byte_size(struct mp_aframe *frame)
-{
-    // God damn, AVFrame is too fucking annoying. Just go with the size that
-    // allocating a new frame would use.
-    int planes = mp_aframe_get_planes(frame);
-    size_t sstride = mp_aframe_get_sstride(frame);
-    int samples = frame->av_frame->nb_samples;
-    int plane_size = MP_ALIGN_UP(sstride * MPMAX(samples, 1), 32);
-    return plane_size * planes + sizeof(*frame);
-}
-
 struct mp_aframe_pool {
    AVBufferPool *avpool;
    int element_size;
@@ -669,11 +542,7 @@ int mp_aframe_pool_allocate(struct mp_aframe_pool *pool, struct mp_aframe *frame
 {
    int planes = mp_aframe_get_planes(frame);
    size_t sstride = mp_aframe_get_sstride(frame);
-    // FFmpeg hardcodes similar hidden possibly-requirements in a number of
-    // places: av_frame_get_buffer(), libavcodec's get_buffer(), mem.c,
-    // probably more.
-    int align_samples = MP_ALIGN_UP(MPMAX(samples, 1), 32);
-    int plane_size = MP_ALIGN_UP(sstride * align_samples, 64);
+    int plane_size = MP_ALIGN_UP(sstride * MPMAX(samples, 1), 32);
    int size = plane_size * planes;

    if (size <= 0 || mp_aframe_is_allocated(frame))
@@ -697,23 +566,16 @@ int mp_aframe_pool_allocate(struct mp_aframe_pool *pool, struct mp_aframe *frame
    AVFrame *av_frame = frame->av_frame;
    if (av_frame->extended_data != av_frame->data)
        av_freep(&av_frame->extended_data); // sigh
-    if (planes > AV_NUM_DATA_POINTERS) {
-        av_frame->extended_data =
-            av_calloc(planes, sizeof(av_frame->extended_data[0]));
-        MP_HANDLE_OOM(av_frame->extended_data);
-    } else {
-        av_frame->extended_data = av_frame->data;
-    }
+    av_frame->extended_data =
+        av_mallocz_array(planes, sizeof(av_frame->extended_data[0]));
+    if (!av_frame->extended_data)
+        abort();
    av_frame->buf[0] = av_buffer_pool_get(pool->avpool);
    if (!av_frame->buf[0])
        return -1;
    av_frame->linesize[0] = samples * sstride;
    for (int n = 0; n < planes; n++)
        av_frame->extended_data[n] = av_frame->buf[0]->data + n * plane_size;
-    if (planes > AV_NUM_DATA_POINTERS) {
-        for (int n = 0; n < AV_NUM_DATA_POINTERS; n++)
-            av_frame->data[n] = av_frame->extended_data[n];
-    }
    av_frame->nb_samples = samples;

    return 0;
@@ -20,7 +20,6 @@ struct AVFrame *mp_aframe_to_avframe_and_unref(struct mp_aframe *frame);
 struct AVFrame *mp_aframe_get_raw_avframe(struct mp_aframe *frame);

 bool mp_aframe_is_allocated(struct mp_aframe *frame);
-bool mp_aframe_alloc_data(struct mp_aframe *frame, int samples);

 void mp_aframe_config_copy(struct mp_aframe *dst, struct mp_aframe *src);
 bool mp_aframe_config_equals(struct mp_aframe *a, struct mp_aframe *b);
@@ -52,15 +51,10 @@ int mp_aframe_get_planes(struct mp_aframe *frame);
 int mp_aframe_get_total_plane_samples(struct mp_aframe *frame);
 size_t mp_aframe_get_sstride(struct mp_aframe *frame);

-bool mp_aframe_reverse(struct mp_aframe *frame);
-
-int mp_aframe_approx_byte_size(struct mp_aframe *frame);
-
 char *mp_aframe_format_str_buf(char *buf, size_t buf_size, struct mp_aframe *fmt);
 #define mp_aframe_format_str(fmt) mp_aframe_format_str_buf((char[32]){0}, 32, (fmt))

 void mp_aframe_skip_samples(struct mp_aframe *f, int samples);
-void mp_aframe_sanitize_float(struct mp_aframe *f);
 double mp_aframe_end_pts(struct mp_aframe *f);
 double mp_aframe_duration(struct mp_aframe *f);
 void mp_aframe_clip_timestamps(struct mp_aframe *f, double start, double end);
@@ -0,0 +1,157 @@
+/*
+ * 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/>.
+ */
+
+#include <stddef.h>
+#include <limits.h>
+#include <assert.h>
+
+#include "common/common.h"
+
+#include "chmap.h"
+#include "audio_buffer.h"
+#include "format.h"
+
+struct mp_audio_buffer {
+    int format;
+    struct mp_chmap channels;
+    int srate;
+    int sstride;
+    int num_planes;
+    uint8_t *data[MP_NUM_CHANNELS];
+    int allocated;
+    int num_samples;
+};
+
+struct mp_audio_buffer *mp_audio_buffer_create(void *talloc_ctx)
+{
+    return talloc_zero(talloc_ctx, struct mp_audio_buffer);
+}
+
+// Reinitialize the buffer, set a new format, drop old data.
+// The audio data in fmt is not used, only the format.
+void mp_audio_buffer_reinit_fmt(struct mp_audio_buffer *ab, int format,
+                                const struct mp_chmap *channels, int srate)
+{
+    for (int n = 0; n < MP_NUM_CHANNELS; n++)
+        TA_FREEP(&ab->data[n]);
+    ab->format = format;
+    ab->channels = *channels;
+    ab->srate = srate;
+    ab->allocated = 0;
+    ab->num_samples = 0;
+    ab->sstride = af_fmt_to_bytes(ab->format);
+    ab->num_planes = 1;
+    if (af_fmt_is_planar(ab->format)) {
+        ab->num_planes = ab->channels.num;
+    } else {
+        ab->sstride *= ab->channels.num;
+    }
+}
+
+// Make the total size of the internal buffer at least this number of samples.
+void mp_audio_buffer_preallocate_min(struct mp_audio_buffer *ab, int samples)
+{
+    if (samples > ab->allocated) {
+        for (int n = 0; n < ab->num_planes; n++) {
+            ab->data[n] = talloc_realloc(ab, ab->data[n], char,
+                                         ab->sstride * samples);
+        }
+        ab->allocated = samples;
+    }
+}
+
+// Get number of samples that can be written without forcing a resize of the
+// internal buffer.
+int mp_audio_buffer_get_write_available(struct mp_audio_buffer *ab)
+{
+    return ab->allocated - ab->num_samples;
+}
+
+// All integer parameters are in samples.
+// dst and src can overlap.
+static void copy_planes(struct mp_audio_buffer *ab,
+                        uint8_t **dst, int dst_offset,
+                        uint8_t **src, int src_offset, int length)
+{
+    for (int n = 0; n < ab->num_planes; n++) {
+        memmove((char *)dst[n] + dst_offset * ab->sstride,
+                (char *)src[n] + src_offset * ab->sstride,
+                length * ab->sstride);
+    }
+}
+
+// Append data to the end of the buffer.
+// If the buffer is not large enough, it is transparently resized.
+void mp_audio_buffer_append(struct mp_audio_buffer *ab, void **ptr, int samples)
+{
+    mp_audio_buffer_preallocate_min(ab, ab->num_samples + samples);
+    copy_planes(ab, ab->data, ab->num_samples, (uint8_t **)ptr, 0, samples);
+    ab->num_samples += samples;
+}
+
+// Prepend silence to the start of the buffer.
+void mp_audio_buffer_prepend_silence(struct mp_audio_buffer *ab, int samples)
+{
+    assert(samples >= 0);
+    mp_audio_buffer_preallocate_min(ab, ab->num_samples + samples);
+    copy_planes(ab, ab->data, samples, ab->data, 0, ab->num_samples);
+    ab->num_samples += samples;
+    for (int n = 0; n < ab->num_planes; n++)
+        af_fill_silence(ab->data[n], samples * ab->sstride, ab->format);
+}
+
+void mp_audio_buffer_duplicate(struct mp_audio_buffer *ab, int samples)
+{
+    assert(samples >= 0 && samples <= ab->num_samples);
+    mp_audio_buffer_preallocate_min(ab, ab->num_samples + samples);
+    copy_planes(ab, ab->data, ab->num_samples,
+                ab->data, ab->num_samples - samples, samples);
+    ab->num_samples += samples;
+}
+
+// Get the start of the current readable buffer.
+void mp_audio_buffer_peek(struct mp_audio_buffer *ab, uint8_t ***ptr,
+                          int *samples)
+{
+    *ptr = ab->data;
+    *samples = ab->num_samples;
+}
+
+// Skip leading samples. (Used with mp_audio_buffer_peek() to read data.)
+void mp_audio_buffer_skip(struct mp_audio_buffer *ab, int samples)
+{
+    assert(samples >= 0 && samples <= ab->num_samples);
+    copy_planes(ab, ab->data, 0, ab->data, samples, ab->num_samples - samples);
+    ab->num_samples -= samples;
+}
+
+void mp_audio_buffer_clear(struct mp_audio_buffer *ab)
+{
+    ab->num_samples = 0;
+}
+
+// Return number of buffered audio samples
+int mp_audio_buffer_samples(struct mp_audio_buffer *ab)
+{
+    return ab->num_samples;
+}
+
+// Return amount of buffered audio in seconds.
+double mp_audio_buffer_seconds(struct mp_audio_buffer *ab)
+{
+    return ab->num_samples / (double)ab->srate;
+}
@@ -0,0 +1,39 @@
+/*
+ * 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/>.
+ */
+
+#ifndef MP_AUDIO_BUFFER_H
+#define MP_AUDIO_BUFFER_H
+
+struct mp_audio_buffer;
+struct mp_chmap;
+
+struct mp_audio_buffer *mp_audio_buffer_create(void *talloc_ctx);
+void mp_audio_buffer_reinit_fmt(struct mp_audio_buffer *ab, int format,
+                                const struct mp_chmap *channels, int srate);
+void mp_audio_buffer_preallocate_min(struct mp_audio_buffer *ab, int samples);
+int mp_audio_buffer_get_write_available(struct mp_audio_buffer *ab);
+void mp_audio_buffer_append(struct mp_audio_buffer *ab, void **ptr, int samples);
+void mp_audio_buffer_prepend_silence(struct mp_audio_buffer *ab, int samples);
+void mp_audio_buffer_duplicate(struct mp_audio_buffer *ab, int samples);
+void mp_audio_buffer_peek(struct mp_audio_buffer *ab, uint8_t ***ptr,
+                          int *samples);
+void mp_audio_buffer_skip(struct mp_audio_buffer *ab, int samples);
+void mp_audio_buffer_clear(struct mp_audio_buffer *ab);
+int mp_audio_buffer_samples(struct mp_audio_buffer *ab);
+double mp_audio_buffer_seconds(struct mp_audio_buffer *ab);
+
+#endif
@@ -52,11 +52,6 @@ static const char *const speaker_names[MP_SPEAKER_ID_COUNT][2] = {
    [MP_SPEAKER_ID_SDL]         = {"sdl",  "surround direct left"},
    [MP_SPEAKER_ID_SDR]         = {"sdr",  "surround direct right"},
    [MP_SPEAKER_ID_LFE2]        = {"lfe2", "low frequency 2"},
-    [MP_SPEAKER_ID_TSL]         = {"tsl",  "top side left"},
-    [MP_SPEAKER_ID_TSR]         = {"tsr",  "top side right"},
-    [MP_SPEAKER_ID_BFC]         = {"bfc",  "bottom front center"},
-    [MP_SPEAKER_ID_BFL]         = {"bfl",  "bottom front left"},
-    [MP_SPEAKER_ID_BFR]         = {"bfr",  "bottom front right"},
    [MP_SPEAKER_ID_NA]          = {"na",   "not available"},
 };

@@ -88,7 +83,7 @@ static const char *const std_layout_names[][2] = {
    {"6.0(front)",      "fl-fr-flc-frc-sl-sr"},
    {"hexagonal",       "fl-fr-fc-bl-br-bc"},
    {"6.1",             "fl-fr-fc-lfe-bc-sl-sr"},
-    {"6.1(back)",       "fl-fr-fc-lfe-bl-br-bc"},
+    {"6.1(back)",       "fl-fr-fc-lfe-bl-br-bc"}, // lavc calls this "6.1" too
    {"6.1(top)",        "fl-fr-fc-lfe-bl-br-tc"}, // not in lavc
    {"6.1(front)",      "fl-fr-lfe-flc-frc-sl-sr"},
    {"7.0",             "fl-fr-fc-bl-br-sl-sr"},
@@ -98,13 +93,8 @@ static const char *const std_layout_names[][2] = {
    {"7.1(alsa)",       "fl-fr-bl-br-fc-lfe-sl-sr"}, // not in lavc
    {"7.1(wide)",       "fl-fr-fc-lfe-bl-br-flc-frc"},
    {"7.1(wide-side)",  "fl-fr-fc-lfe-flc-frc-sl-sr"},
-    {"7.1(top)",        "fl-fr-fc-lfe-bl-br-tfl-tfr"},
    {"7.1(rear)",       "fl-fr-fc-lfe-bl-br-sdl-sdr"}, // not in lavc
    {"octagonal",       "fl-fr-fc-bl-br-bc-sl-sr"},
-    {"cube",            "fl-fr-bl-br-tfl-tfr-tbl-tbr"},
-    {"hexadecagonal",   "fl-fr-fc-bl-br-bc-sl-sr-tfc-tfl-tfr-tbl-tbc-tbr-wl-wr"},
-    {"downmix",         "fl-fr"},
-    {"22.2",            "fl-fr-fc-lfe-bl-br-flc-frc-bc-sl-sr-tc-tfl-tfc-tfr-tbl-tbc-tbr-lfe2-tsl-tsr-bfc-bfl-bfr"},
    {"auto",            ""}, // not in lavc
    {0}
 };
@@ -480,23 +470,6 @@ char *mp_chmap_to_str_hr_buf(char *buf, size_t buf_size, const struct mp_chmap *
    return mp_chmap_to_str_buf(buf, buf_size, &map);
 }

-mp_ch_layout_tuple *mp_iterate_builtin_layouts(void **opaque)
-{
-    uintptr_t i = (uintptr_t)*opaque;
-
-    if (i >= MP_ARRAY_SIZE(std_layout_names) ||
-        !std_layout_names[i][0])
-        return NULL;
-
-    *opaque = (void *)(i + 1);
-
-    if (std_layout_names[i][1][0] == '\0') {
-        return mp_iterate_builtin_layouts(opaque);
-    }
-
-    return &std_layout_names[i];
-}
-
 void mp_chmap_print_help(struct mp_log *log)
 {
    mp_info(log, "Speakers:\n");
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include "misc/bstr.h"

-#define MP_NUM_CHANNELS 64
+#define MP_NUM_CHANNELS 16

 // Speaker a channel can be assigned to.
 // This corresponds to WAVEFORMATEXTENSIBLE channel mask bit indexes.
@@ -55,11 +55,6 @@ enum mp_speaker_id {
    MP_SPEAKER_ID_SDL,          // SURROUND_DIRECT_LEFT
    MP_SPEAKER_ID_SDR,          // SURROUND_DIRECT_RIGHT
    MP_SPEAKER_ID_LFE2,         // LOW_FREQUENCY_2
-    MP_SPEAKER_ID_TSL,          // TOP_SIDE_LEFT
-    MP_SPEAKER_ID_TSR,          // TOP_SIDE_RIGHT,
-    MP_SPEAKER_ID_BFC,          // BOTTOM_FRONT_CENTER
-    MP_SPEAKER_ID_BFL,          // BOTTOM_FRONT_LEFT
-    MP_SPEAKER_ID_BFR,          // BOTTOM_FRONT_RIGHT

    // Speaker IDs >= 64 are not representable in WAVEFORMATEXTENSIBLE or libav*.

@@ -80,8 +75,6 @@ struct mp_chmap {
    uint8_t speaker[MP_NUM_CHANNELS];
 };

-typedef const char * const (mp_ch_layout_tuple)[2];
-
 #define MP_SP(speaker) MP_SPEAKER_ID_ ## speaker

 #define MP_CHMAP2(a, b) \
@@ -129,28 +122,13 @@ void mp_chmap_get_reorder(int src[MP_NUM_CHANNELS], const struct mp_chmap *from,
 int mp_chmap_diffn(const struct mp_chmap *a, const struct mp_chmap *b);

 char *mp_chmap_to_str_buf(char *buf, size_t buf_size, const struct mp_chmap *src);
-#define mp_chmap_to_str_(m, sz) mp_chmap_to_str_buf((char[sz]){0}, sz, (m))
-#define mp_chmap_to_str(m) mp_chmap_to_str_(m, MP_NUM_CHANNELS * 4)
+#define mp_chmap_to_str(m) mp_chmap_to_str_buf((char[64]){0}, 64, (m))

 char *mp_chmap_to_str_hr_buf(char *buf, size_t buf_size, const struct mp_chmap *src);
-#define mp_chmap_to_str_hr_(m, sz) mp_chmap_to_str_hr_buf((char[sz]){0}, sz, (m))
-#define mp_chmap_to_str_hr(m) mp_chmap_to_str_hr_(m, MP_NUM_CHANNELS * 4)
+#define mp_chmap_to_str_hr(m) mp_chmap_to_str_hr_buf((char[128]){0}, 128, (m))

 bool mp_chmap_from_str(struct mp_chmap *dst, bstr src);

-/**
- * Iterate over all built-in channel layouts which have mapped channels.
- *
- * @param opaque a pointer where the iteration state is stored. Must point
- *               to nullptr to start the iteration.
- *
- * @return nullptr when the iteration is finished.
- *         Otherwise a pointer to an array of two char pointers.
- *         - [0] being the human-readable layout name.
- *         - [1] being the string representation of the layout.
- */
-mp_ch_layout_tuple *mp_iterate_builtin_layouts(void **opaque);
-
 struct mp_log;
 void mp_chmap_print_help(struct mp_log *log);

@@ -1,51 +0,0 @@
-/*
- * 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/>.
- */
-
-#include <libavutil/channel_layout.h>
-
-#include "chmap.h"
-#include "chmap_avchannel.h"
-
-bool mp_chmap_from_av_layout(struct mp_chmap *dst, const AVChannelLayout *src)
-{
-    *dst = (struct mp_chmap) {0};
-
-    switch (src->order) {
-    case AV_CHANNEL_ORDER_UNSPEC:
-        mp_chmap_from_channels(dst, src->nb_channels);
-        return dst->num == src->nb_channels;
-    case AV_CHANNEL_ORDER_NATIVE:
-        mp_chmap_from_lavc(dst, src->u.mask);
-        return dst->num == src->nb_channels;
-    default:
-        // TODO: handle custom layouts
-        return false;
-    }
-}
-
-void mp_chmap_to_av_layout(AVChannelLayout *dst, const struct mp_chmap *src)
-{
-    *dst = (AVChannelLayout){
-        .order = AV_CHANNEL_ORDER_UNSPEC,
-        .nb_channels = src->num,
-    };
-
-    // TODO: handle custom layouts
-    if (!mp_chmap_is_unknown(src)) {
-        av_channel_layout_from_mask(dst, mp_chmap_to_lavc(src));
-    }
-}
@@ -26,11 +26,8 @@
 #include <libavutil/common.h>
 #include <libavutil/intreadwrite.h>

-#include "config.h"
-
 #include "mpv_talloc.h"
 #include "audio/aframe.h"
-#include "audio/chmap_avchannel.h"
 #include "audio/fmt-conversion.h"
 #include "common/av_common.h"
 #include "common/codecs.h"
@@ -40,19 +37,17 @@
 #include "demux/stheader.h"
 #include "filters/f_decoder_wrapper.h"
 #include "filters/filter_internal.h"
-#include "options/m_config.h"
 #include "options/options.h"

 struct priv {
    AVCodecContext *avctx;
    AVFrame *avframe;
-    AVPacket *avpkt;
    struct mp_chmap force_channel_map;
    uint32_t skip_samples, trim_samples;
    bool preroll_done;
    double next_pts;
    AVRational codec_timebase;
-    struct lavc_state state;
+    bool eof_returned;

    struct mp_decoder public;
 };
@@ -60,22 +55,23 @@ struct priv {
 #define OPT_BASE_STRUCT struct ad_lavc_params
 struct ad_lavc_params {
    float ac3drc;
-    bool downmix;
+    int downmix;
    int threads;
    char **avopts;
 };

 const struct m_sub_options ad_lavc_conf = {
    .opts = (const m_option_t[]) {
-        {"ac3drc", OPT_FLOAT(ac3drc), M_RANGE(0, 6)},
-        {"downmix", OPT_BOOL(downmix)},
-        {"threads", OPT_INT(threads), M_RANGE(0, 16)},
-        {"o", OPT_KEYVALUELIST(avopts)},
+        OPT_FLOATRANGE("ac3drc", ac3drc, 0, 0, 6),
+        OPT_FLAG("downmix", downmix, 0),
+        OPT_INTRANGE("threads", threads, 0, 0, 16),
+        OPT_KEYVALUELIST("o", avopts, 0),
        {0}
    },
    .size = sizeof(struct ad_lavc_params),
    .defaults = &(const struct ad_lavc_params){
        .ac3drc = 0,
+        .downmix = 1,
        .threads = 1,
    },
 };
@@ -84,11 +80,10 @@ static bool init(struct mp_filter *da, struct mp_codec_params *codec,
                 const char *decoder)
 {
    struct priv *ctx = da->priv;
-    struct MPOpts *mpopts = mp_get_config_group(ctx, da->global, &mp_opt_root);
-    struct ad_lavc_params *opts =
-        mp_get_config_group(ctx, da->global, &ad_lavc_conf);
+    struct MPOpts *mpopts = da->global->opts;
+    struct ad_lavc_params *opts = mpopts->ad_lavc_params;
    AVCodecContext *lavc_context;
-    const AVCodec *lavc_codec;
+    AVCodec *lavc_codec;

    ctx->codec_timebase = mp_get_codec_timebase(codec);

@@ -104,37 +99,26 @@ static bool init(struct mp_filter *da, struct mp_codec_params *codec,
    lavc_context = avcodec_alloc_context3(lavc_codec);
    ctx->avctx = lavc_context;
    ctx->avframe = av_frame_alloc();
-    ctx->avpkt = av_packet_alloc();
-    MP_HANDLE_OOM(ctx->avctx && ctx->avframe && ctx->avpkt);
    lavc_context->codec_type = AVMEDIA_TYPE_AUDIO;
    lavc_context->codec_id = lavc_codec->id;
+
+#if LIBAVCODEC_VERSION_MICRO >= 100
    lavc_context->pkt_timebase = ctx->codec_timebase;
+#endif

    if (opts->downmix && mpopts->audio_output_channels.num_chmaps == 1) {
-        const struct mp_chmap *requested_layout =
-            &mpopts->audio_output_channels.chmaps[0];
-#if !HAVE_AV_CHANNEL_LAYOUT
        lavc_context->request_channel_layout =
-            mp_chmap_to_lavc(requested_layout);
-#else
-        AVChannelLayout av_layout = { 0 };
-        mp_chmap_to_av_layout(&av_layout, requested_layout);
-
-        // Always try to set requested output layout - currently only something
-        // supported by AC3, MLP/TrueHD, DTS and the fdk-aac wrapper.
-        av_opt_set_chlayout(lavc_context, "downmix", &av_layout,
-                            AV_OPT_SEARCH_CHILDREN);
-
-        av_channel_layout_uninit(&av_layout);
-#endif
+            mp_chmap_to_lavc(&mpopts->audio_output_channels.chmaps[0]);
    }

    // Always try to set - option only exists for AC3 at the moment
    av_opt_set_double(lavc_context, "drc_scale", opts->ac3drc,
                      AV_OPT_SEARCH_CHILDREN);

+#if LIBAVCODEC_VERSION_MICRO >= 100
    // Let decoder add AV_FRAME_DATA_SKIP_SAMPLES.
    av_opt_set(lavc_context, "flags2", "+skip_manual", AV_OPT_SEARCH_CHILDREN);
+#endif

    mp_set_avopts(da->log, lavc_context, opts->avopts);

@@ -162,7 +146,6 @@ static void destroy(struct mp_filter *da)

    avcodec_free_context(&ctx->avctx);
    av_frame_free(&ctx->avframe);
-    mp_free_av_packet(&ctx->avpkt);
 }

 static void reset(struct mp_filter *da)
@@ -174,10 +157,10 @@ static void reset(struct mp_filter *da)
    ctx->trim_samples = 0;
    ctx->preroll_done = false;
    ctx->next_pts = MP_NOPTS_VALUE;
-    ctx->state = (struct lavc_state){0};
+    ctx->eof_returned = false;
 }

-static int send_packet(struct mp_filter *da, struct demux_packet *mpkt)
+static bool send_packet(struct mp_filter *da, struct demux_packet *mpkt)
 {
    struct priv *priv = da->priv;
    AVCodecContext *avctx = priv->avctx;
@@ -188,15 +171,20 @@ static int send_packet(struct mp_filter *da, struct demux_packet *mpkt)
    if (mpkt && priv->next_pts == MP_NOPTS_VALUE)
        priv->next_pts = mpkt->pts;

-    mp_set_av_packet(priv->avpkt, mpkt, &priv->codec_timebase);
+    AVPacket pkt;
+    mp_set_av_packet(&pkt, mpkt, &priv->codec_timebase);
+
+    int ret = avcodec_send_packet(avctx, mpkt ? &pkt : NULL);
+
+    if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
+        return false;

-    int ret = avcodec_send_packet(avctx, mpkt ? priv->avpkt : NULL);
    if (ret < 0)
        MP_ERR(da, "Error decoding audio.\n");
-    return ret;
+    return true;
 }

-static int receive_frame(struct mp_filter *da, struct mp_frame *out)
+static bool receive_frame(struct mp_filter *da, struct mp_frame *out)
 {
    struct priv *priv = da->priv;
    AVCodecContext *avctx = priv->avctx;
@@ -208,24 +196,24 @@ static int receive_frame(struct mp_filter *da, struct mp_frame *out)
        // over in case we get new packets at some point in the future.
        // (Dont' reset the filter itself, we want to keep other state.)
        avcodec_flush_buffers(priv->avctx);
-        return ret;
+        return false;
    } else if (ret < 0 && ret != AVERROR(EAGAIN)) {
        MP_ERR(da, "Error decoding audio.\n");
    }

+#if LIBAVCODEC_VERSION_MICRO >= 100
    if (priv->avframe->flags & AV_FRAME_FLAG_DISCARD)
        av_frame_unref(priv->avframe);
+#endif

    if (!priv->avframe->buf[0])
-        return ret;
+        return true;

    double out_pts = mp_pts_from_av(priv->avframe->pts, &priv->codec_timebase);

    struct mp_aframe *mpframe = mp_aframe_from_avframe(priv->avframe);
-    if (!mpframe) {
-        MP_ERR(da, "Converting libavcodec frame to mpv frame failed.\n");
-        return ret;
-    }
+    if (!mpframe)
+        return true;

    if (priv->force_channel_map.num)
        mp_aframe_set_chmap(mpframe, &priv->force_channel_map);
@@ -236,6 +224,7 @@ static int receive_frame(struct mp_filter *da, struct mp_frame *out)

    priv->next_pts = mp_aframe_end_pts(mpframe);

+#if LIBAVCODEC_VERSION_MICRO >= 100
    AVFrameSideData *sd =
        av_frame_get_side_data(priv->avframe, AV_FRAME_DATA_SKIP_SAMPLES);
    if (sd && sd->size >= 10) {
@@ -243,6 +232,7 @@ static int receive_frame(struct mp_filter *da, struct mp_frame *out)
        priv->skip_samples += AV_RL32(d + 0);
        priv->trim_samples += AV_RL32(d + 4);
    }
+#endif

    if (!priv->preroll_done) {
        // Skip only if this isn't already handled by AV_FRAME_DATA_SKIP_SAMPLES.
@@ -262,25 +252,18 @@ static int receive_frame(struct mp_filter *da, struct mp_frame *out)
        priv->trim_samples -= trim;
    }

-    // Strip possibly bogus float values like Infinity, NaN, denormalized
-    mp_aframe_sanitize_float(mpframe);
-
-    if (mp_aframe_get_size(mpframe) > 0) {
-        *out = MAKE_FRAME(MP_FRAME_AUDIO, mpframe);
-    } else {
-        talloc_free(mpframe);
-    }
+    *out = MAKE_FRAME(MP_FRAME_AUDIO, mpframe);

    av_frame_unref(priv->avframe);

-    return ret;
+    return true;
 }

 static void process(struct mp_filter *ad)
 {
    struct priv *priv = ad->priv;

-    lavc_process(ad, &priv->state, send_packet, receive_frame);
+    lavc_process(ad, &priv->eof_returned, send_packet, receive_frame);
 }

 static const struct mp_filter_info ad_lavc_filter = {
@@ -41,7 +41,6 @@ struct spdifContext {
    struct mp_log   *log;
    enum AVCodecID   codec_id;
    AVFormatContext *lavf_ctx;
-    AVPacket        *avpkt;
    int              out_buffer_len;
    uint8_t          out_buffer[OUTBUF_SIZE];
    bool             need_close;
@@ -83,7 +82,6 @@ static void destroy(struct mp_filter *da)
        avformat_free_context(lavf_ctx);
        spdif_ctx->lavf_ctx = NULL;
    }
-    mp_free_av_packet(&spdif_ctx->avpkt);
 }

 static void determine_codec_params(struct mp_filter *da, AVPacket *pkt,
@@ -118,7 +116,7 @@ static void determine_codec_params(struct mp_filter *da, AVPacket *pkt,
    if (profile != FF_PROFILE_UNKNOWN || spdif_ctx->codec_id != AV_CODEC_ID_DTS)
        return;

-    const AVCodec *codec = avcodec_find_decoder(spdif_ctx->codec_id);
+    AVCodec *codec = avcodec_find_decoder(spdif_ctx->codec_id);
    if (!codec)
        goto done;

@@ -149,12 +147,10 @@ done:
        MP_WARN(da, "Failed to parse codec profile.\n");
 }

-static int init_filter(struct mp_filter *da)
+static int init_filter(struct mp_filter *da, AVPacket *pkt)
 {
    struct spdifContext *spdif_ctx = da->priv;

-    AVPacket *pkt = spdif_ctx->avpkt;
-
    int profile = FF_PROFILE_UNKNOWN;
    int c_rate = 0;
    determine_codec_params(da, pkt, &profile, &c_rate);
@@ -171,7 +167,8 @@ static int init_filter(struct mp_filter *da)
        goto fail;

    void *buffer = av_mallocz(OUTBUF_SIZE);
-   MP_HANDLE_OOM(buffer);
+    if (!buffer)
+        abort();
    lavf_ctx->pb = avio_alloc_context(buffer, OUTBUF_SIZE, 1, spdif_ctx, NULL,
                                      write_packet, NULL);
    if (!lavf_ctx->pb) {
@@ -179,8 +176,10 @@ static int init_filter(struct mp_filter *da)
        goto fail;
    }

-    // Request minimal buffering
+    // Request minimal buffering (not available on Libav)
+#if LIBAVFORMAT_VERSION_MICRO >= 100
    lavf_ctx->pb->direct = 1;
+#endif

    AVStream *stream = avformat_new_stream(lavf_ctx, 0);
    if (!stream)
@@ -209,21 +208,13 @@ static int init_filter(struct mp_filter *da)
        break;
    case AV_CODEC_ID_DTS: {
        bool is_hd = profile == FF_PROFILE_DTS_HD_HRA ||
-                     profile == FF_PROFILE_DTS_HD_MA  ||
+                     profile == FF_PROFILE_DTS_HD_MA ||
                     profile == FF_PROFILE_UNKNOWN;
-
-        // Apparently, DTS-HD over SPDIF is specified to be 7.1 (8 channels)
-        // for DTS-HD MA, and stereo (2 channels) for DTS-HD HRA. The bit
-        // streaming rate as well as the signaled channel count are defined
-        // based on this value.
-        int dts_hd_spdif_channel_count = profile == FF_PROFILE_DTS_HD_HRA ?
-                                         2 : 8;
        if (spdif_ctx->use_dts_hd && is_hd) {
-            av_dict_set_int(&format_opts, "dtshd_rate",
-                            dts_hd_spdif_channel_count * 96000, 0);
+            av_dict_set(&format_opts, "dtshd_rate", "768000", 0); // 4*192000
            sample_format               = AF_FORMAT_S_DTSHD;
            samplerate                  = 192000;
-            num_channels                = dts_hd_spdif_channel_count;
+            num_channels                = 2*4;
        } else {
            sample_format               = AF_FORMAT_S_DTS;
            samplerate                  = 48000;
@@ -298,20 +289,15 @@ static void process(struct mp_filter *da)
    struct mp_aframe *out = NULL;
    double pts = mpkt->pts;

-    if (!spdif_ctx->avpkt) {
-        spdif_ctx->avpkt = av_packet_alloc();
-        MP_HANDLE_OOM(spdif_ctx->avpkt);
-    }
-    mp_set_av_packet(spdif_ctx->avpkt, mpkt, NULL);
-    spdif_ctx->avpkt->pts = spdif_ctx->avpkt->dts = 0;
+    AVPacket pkt;
+    mp_set_av_packet(&pkt, mpkt, NULL);
+    pkt.pts = pkt.dts = 0;
    if (!spdif_ctx->lavf_ctx) {
-        if (init_filter(da) < 0)
+        if (init_filter(da, &pkt) < 0)
            goto done;
-        assert(spdif_ctx->avpkt);
    }
-
    spdif_ctx->out_buffer_len  = 0;
-    int ret = av_write_frame(spdif_ctx->lavf_ctx, spdif_ctx->avpkt);
+    int ret = av_write_frame(spdif_ctx->lavf_ctx, &pkt);
    avio_flush(spdif_ctx->lavf_ctx->pb);
    if (ret < 0) {
        MP_ERR(da, "spdif mux error: '%s'\n", mp_strerror(AVUNERROR(ret)));
@@ -432,7 +418,6 @@ static struct mp_decoder *create(struct mp_filter *parent,
        talloc_free(da);
        return NULL;
    }
-
    return &spdif_ctx->public;
 }

@@ -1,114 +0,0 @@
-#include "audio/aframe.h"
-#include "audio/format.h"
-#include "common/common.h"
-#include "filters/f_autoconvert.h"
-#include "filters/filter_internal.h"
-#include "filters/user_filters.h"
-
-struct priv {
-    double speed;
-    double diff; // amount of too many additional samples in normal speed
-    struct mp_aframe *last; // for repeating
-};
-
-static void process(struct mp_filter *f)
-{
-    struct priv *p = f->priv;
-
-    if (!mp_pin_in_needs_data(f->ppins[1]))
-        return;
-
-    struct mp_frame frame = {0};
-
-    double last_dur = p->last ? mp_aframe_duration(p->last) : 0;
-    if (p->last && p->diff < 0 && -p->diff > last_dur / 2) {
-        MP_VERBOSE(f, "repeat\n");
-        frame = MAKE_FRAME(MP_FRAME_AUDIO, p->last);
-        p->last = NULL;
-    } else {
-        frame = mp_pin_out_read(f->ppins[0]);
-
-        if (frame.type == MP_FRAME_AUDIO) {
-            last_dur = mp_aframe_duration(frame.data);
-            p->diff -= last_dur;
-            if (p->diff > last_dur / 2) {
-                MP_VERBOSE(f, "drop\n");
-                mp_frame_unref(&frame);
-                mp_filter_internal_mark_progress(f);
-            }
-        }
-    }
-
-    if (frame.type == MP_FRAME_AUDIO) {
-        struct mp_aframe *fr = frame.data;
-        talloc_free(p->last);
-        p->last = mp_aframe_new_ref(fr);
-        mp_aframe_mul_speed(fr, p->speed);
-        p->diff += mp_aframe_duration(fr);
-        mp_aframe_set_pts(p->last, mp_aframe_end_pts(fr));
-    } else if (frame.type == MP_FRAME_EOF) {
-        TA_FREEP(&p->last);
-    }
-    mp_pin_in_write(f->ppins[1], frame);
-}
-
-static bool command(struct mp_filter *f, struct mp_filter_command *cmd)
-{
-    struct priv *p = f->priv;
-
-    switch (cmd->type) {
-    case MP_FILTER_COMMAND_SET_SPEED:
-        p->speed = cmd->speed;
-        return true;
-    }
-
-    return false;
-}
-
-static void reset(struct mp_filter *f)
-{
-    struct priv *p = f->priv;
-
-    TA_FREEP(&p->last);
-    p->diff = 0;
-}
-
-static void destroy(struct mp_filter *f)
-{
-    reset(f);
-}
-
-static const struct mp_filter_info af_drop_filter = {
-    .name = "drop",
-    .priv_size = sizeof(struct priv),
-    .process = process,
-    .command = command,
-    .reset = reset,
-    .destroy = destroy,
-};
-
-static struct mp_filter *af_drop_create(struct mp_filter *parent, void *options)
-{
-    struct mp_filter *f = mp_filter_create(parent, &af_drop_filter);
-    if (!f) {
-        talloc_free(options);
-        return NULL;
-    }
-
-    mp_filter_add_pin(f, MP_PIN_IN, "in");
-    mp_filter_add_pin(f, MP_PIN_OUT, "out");
-
-    struct priv *p = f->priv;
-    p->speed = 1.0;
-
-    return f;
-}
-
-const struct mp_user_filter_entry af_drop = {
-    .desc = {
-        .description = "Change audio speed by dropping/repeating frames",
-        .name = "drop",
-        .priv_size = sizeof(struct priv),
-    },
-    .create = af_drop_create,
-};
@@ -30,7 +30,7 @@ struct f_opts {
    int out_srate;
    struct m_channels out_channels;

-    bool fail;
+    int fail;
 };

 struct priv {
@@ -128,14 +128,12 @@ const struct mp_user_filter_entry af_format = {
        .description = "Force audio format",
        .priv_size = sizeof(struct f_opts),
        .options = (const struct m_option[]) {
-            {"format", OPT_AUDIOFORMAT(in_format)},
-            {"srate", OPT_INT(in_srate), M_RANGE(1000, 8*48000)},
-            {"channels", OPT_CHANNELS(in_channels),
-                .flags = M_OPT_CHANNELS_LIMITED},
-            {"out-srate", OPT_INT(out_srate), M_RANGE(1000, 8*48000)},
-            {"out-channels", OPT_CHANNELS(out_channels),
-                .flags = M_OPT_CHANNELS_LIMITED},
-            {"fail", OPT_BOOL(fail)},
+            OPT_AUDIOFORMAT("format", in_format, 0),
+            OPT_INTRANGE("srate", in_srate, 0, 1000, 8*48000),
+            OPT_CHANNELS("channels", in_channels, 0, .min = 1),
+            OPT_INTRANGE("out-srate", out_srate, 0, 1000, 8*48000),
+            OPT_CHANNELS("out-channels", out_channels, 0, .min = 1),
+            OPT_FLAG("fail", fail, 0),
            {0}
        },
    },
@@ -31,10 +31,7 @@
 #include <libavutil/bswap.h>
 #include <libavutil/mem.h>

-#include "config.h"
-
 #include "audio/aframe.h"
-#include "audio/chmap_avchannel.h"
 #include "audio/chmap_sel.h"
 #include "audio/fmt-conversion.h"
 #include "audio/format.h"
@@ -50,13 +47,13 @@
 #define AC3_MAX_CHANNELS 6
 #define AC3_MAX_CODED_FRAME_SIZE 3840
 #define AC3_FRAME_SIZE (6  * 256)
-const static uint16_t ac3_bitrate_tab[19] = {
+const uint16_t ac3_bitrate_tab[19] = {
    32, 40, 48, 56, 64, 80, 96, 112, 128,
    160, 192, 224, 256, 320, 384, 448, 512, 576, 640
 };

 struct f_opts {
-    bool add_iec61937_header;
+    int add_iec61937_header;
    int bit_rate;
    int min_channel_num;
    char *encoder;
@@ -71,9 +68,8 @@ struct priv {
    struct mp_aframe *in_frame;
    struct mp_aframe_pool *out_pool;

-    const struct AVCodec  *lavc_acodec;
+    struct AVCodec        *lavc_acodec;
    struct AVCodecContext *lavc_actx;
-    AVPacket              *lavc_pkt;
    int bit_rate;
    int out_samples;    // upper bound on encoded output per AC3 frame
 };
@@ -107,13 +103,8 @@ static bool reinit(struct mp_filter *f)

    // Put sample parameters
    s->lavc_actx->sample_fmt = af_to_avformat(format);
-
-#if !HAVE_AV_CHANNEL_LAYOUT
    s->lavc_actx->channels = chmap.num;
    s->lavc_actx->channel_layout = mp_chmap_to_lavc(&chmap);
-#else
-    mp_chmap_to_av_layout(&s->lavc_actx->ch_layout, &chmap);
-#endif
    s->lavc_actx->sample_rate = rate;
    s->lavc_actx->bit_rate = bit_rate;

@@ -143,7 +134,6 @@ static void destroy(struct mp_filter *f)
    struct priv *s = f->priv;

    reset(f);
-    av_packet_free(&s->lavc_pkt);
    avcodec_free_context(&s->lavc_actx);
 }

@@ -162,57 +152,57 @@ static void process(struct mp_filter *f)

    bool err = true;
    struct mp_aframe *out = NULL;
-    AVPacket *pkt = s->lavc_pkt;
+    AVPacket pkt = {0};
+    av_init_packet(&pkt);

    // Send input as long as it wants.
    while (1) {
        if (avcodec_is_open(s->lavc_actx)) {
-            int lavc_ret = avcodec_receive_packet(s->lavc_actx, pkt);
+            int lavc_ret = avcodec_receive_packet(s->lavc_actx, &pkt);
            if (lavc_ret >= 0)
                break;
            if (lavc_ret < 0 && lavc_ret != AVERROR(EAGAIN)) {
                MP_FATAL(f, "Encode failed (receive).\n");
-                goto error;
+                goto done;
            }
        }
        AVFrame *frame = NULL;
        struct mp_frame input = mp_pin_out_read(s->in_pin);
        // The following code assumes no sample data buffering in the encoder.
-        switch (input.type) {
-        case MP_FRAME_NONE:
-            goto done; // no data yet
-        case MP_FRAME_EOF:
+        if (input.type == MP_FRAME_EOF) {
            mp_pin_in_write(f->ppins[1], input);
-            goto done;
-        case MP_FRAME_AUDIO:
+            return;
+        } else if (input.type == MP_FRAME_AUDIO) {
            TA_FREEP(&s->in_frame);
            s->in_frame = input.data;
            frame = mp_frame_to_av(input, NULL);
            if (!frame)
-                goto error;
+                goto done;
            if (mp_aframe_get_channels(s->in_frame) < s->opts->min_channel_num) {
                // Just pass it through.
                s->in_frame = NULL;
                mp_pin_in_write(f->ppins[1], input);
-                goto done;
+                return;
            }
            if (!mp_aframe_config_equals(s->in_frame, s->cur_format)) {
                if (!reinit(f))
-                    goto error;
+                    goto done;
            }
-            break;
-        default: goto error; // unexpected packet type
+        } else if (input.type) {
+            goto done;
+        } else {
+            return; // no data yet
        }
        int lavc_ret = avcodec_send_frame(s->lavc_actx, frame);
        av_frame_free(&frame);
        if (lavc_ret < 0 && lavc_ret != AVERROR(EAGAIN)) {
            MP_FATAL(f, "Encode failed (send).\n");
-            goto error;
+            goto done;
        }
    }

    if (!s->in_frame)
-        goto error;
+        goto done;

    out = mp_aframe_create();
    mp_aframe_set_format(out, AF_FORMAT_S_AC3);
@@ -220,18 +210,18 @@ static void process(struct mp_filter *f)
    mp_aframe_set_rate(out, 48000);

    if (mp_aframe_pool_allocate(s->out_pool, out, s->out_samples) < 0)
-        goto error;
+        goto done;

    int sstride = mp_aframe_get_sstride(out);

    mp_aframe_copy_attributes(out, s->in_frame);

-    int frame_size = pkt->size;
+    int frame_size = pkt.size;
    int header_len = 0;
    char hdr[8];

-    if (s->opts->add_iec61937_header && pkt->size > 5) {
-        int bsmod = pkt->data[5] & 0x7;
+    if (s->opts->add_iec61937_header && pkt.size > 5) {
+        int bsmod = pkt.data[5] & 0x7;
        int len = frame_size;

        frame_size = AC3_FRAME_SIZE * 2 * 2;
@@ -249,22 +239,20 @@ static void process(struct mp_filter *f)

    uint8_t **planes = mp_aframe_get_data_rw(out);
    if (!planes)
-        goto error;
+        goto done;
    char *buf = planes[0];
    memcpy(buf, hdr, header_len);
-    memcpy(buf + header_len, pkt->data, pkt->size);
-    memset(buf + header_len + pkt->size, 0,
-           frame_size - (header_len + pkt->size));
-    swap_16((uint16_t *)(buf + header_len), pkt->size / 2);
+    memcpy(buf + header_len, pkt.data, pkt.size);
+    memset(buf + header_len + pkt.size, 0,
+           frame_size - (header_len + pkt.size));
+    swap_16((uint16_t *)(buf + header_len), pkt.size / 2);
    mp_aframe_set_size(out, frame_size / sstride);
    mp_pin_in_write(f->ppins[1], MAKE_FRAME(MP_FRAME_AUDIO, out));
    out = NULL;

+    err = 0;
 done:
-    err = false;
-    // fall through
-error:
-    av_packet_unref(pkt);
+    av_packet_unref(&pkt);
    talloc_free(out);
    if (err)
        mp_filter_internal_mark_failed(f);
@@ -278,38 +266,6 @@ static const struct mp_filter_info af_lavcac3enc_filter = {
    .destroy = destroy,
 };

-static void add_chmaps_to_autoconv(struct mp_filter *f,
-                                   struct mp_autoconvert *conv,
-                                   const struct AVCodec *codec)
-{
-#if !HAVE_AV_CHANNEL_LAYOUT
-    const uint64_t *lch = codec->channel_layouts;
-    for (int n = 0; lch && lch[n]; n++) {
-        struct mp_chmap chmap = {0};
-        mp_chmap_from_lavc(&chmap, lch[n]);
-        if (mp_chmap_is_valid(&chmap))
-            mp_autoconvert_add_chmap(conv, &chmap);
-    }
-#else
-    const AVChannelLayout *lch = codec->ch_layouts;
-    for (int n = 0; lch && lch[n].nb_channels; n++) {
-        struct mp_chmap chmap = {0};
-
-        if (!mp_chmap_from_av_layout(&chmap, &lch[n])) {
-            char layout[128] = {0};
-            MP_VERBOSE(f, "Skipping unsupported channel layout: %s\n",
-                       av_channel_layout_describe(&lch[n],
-                                                  layout, 128) < 0 ?
-                       "undefined" : layout);
-            continue;
-        }
-
-        if (mp_chmap_is_valid(&chmap))
-            mp_autoconvert_add_chmap(conv, &chmap);
-    }
-#endif
-}
-
 static struct mp_filter *af_lavcac3enc_create(struct mp_filter *parent,
                                              void *options)
 {
@@ -339,23 +295,14 @@ static struct mp_filter *af_lavcac3enc_create(struct mp_filter *parent,
        goto error;
    }

-    s->lavc_pkt = av_packet_alloc();
-    if (!s->lavc_pkt)
-        goto error;
-
    if (mp_set_avopts(f->log, s->lavc_actx, s->opts->avopts) < 0)
        goto error;

-    // For this one, we require the decoder to export lists of all supported
+    // For this one, we require the decoder to expert lists of all supported
    // parameters. (Not all decoders do that, but the ones we're interested
    // in do.)
    if (!s->lavc_acodec->sample_fmts ||
-#if !HAVE_AV_CHANNEL_LAYOUT
-        !s->lavc_acodec->channel_layouts
-#else
-        !s->lavc_acodec->ch_layouts
-#endif
-        )
+        !s->lavc_acodec->channel_layouts)
    {
        MP_ERR(f, "Audio encoder doesn't list supported parameters.\n");
        goto error;
@@ -387,7 +334,13 @@ static struct mp_filter *af_lavcac3enc_create(struct mp_filter *parent,
            mp_autoconvert_add_afmt(conv, mpfmt);
    }

-    add_chmaps_to_autoconv(f, conv, s->lavc_acodec);
+    const uint64_t *lch = s->lavc_acodec->channel_layouts;
+    for (int n = 0; lch && lch[n]; n++) {
+        struct mp_chmap chmap = {0};
+        mp_chmap_from_lavc(&chmap, lch[n]);
+        if (mp_chmap_is_valid(&chmap))
+            mp_autoconvert_add_chmap(conv, &chmap);
+    }

    // At least currently, the AC3 encoder doesn't export sample rates.
    mp_autoconvert_add_srate(conv, 48000);
@@ -404,8 +357,6 @@ static struct mp_filter *af_lavcac3enc_create(struct mp_filter *parent,
    return f;

 error:
-    av_packet_free(&s->lavc_pkt);
-    avcodec_free_context(&s->lavc_actx);
    talloc_free(f);
    return NULL;
 }
@@ -418,18 +369,18 @@ const struct mp_user_filter_entry af_lavcac3enc = {
        .name = "lavcac3enc",
        .priv_size = sizeof(OPT_BASE_STRUCT),
        .priv_defaults = &(const OPT_BASE_STRUCT) {
-            .add_iec61937_header = true,
+            .add_iec61937_header = 1,
            .bit_rate = 640,
            .min_channel_num = 3,
            .encoder = "ac3",
        },
        .options = (const struct m_option[]) {
-            {"tospdif", OPT_BOOL(add_iec61937_header)},
-            {"bitrate", OPT_CHOICE(bit_rate,
-                {"auto", 0}, {"default", 0}), M_RANGE(32, 640)},
-            {"minch", OPT_INT(min_channel_num), M_RANGE(2, 6)},
-            {"encoder", OPT_STRING(encoder)},
-            {"o", OPT_KEYVALUELIST(avopts)},
+            OPT_FLAG("tospdif", add_iec61937_header, 0),
+            OPT_CHOICE_OR_INT("bitrate", bit_rate, 0, 32, 640,
+                            ({"auto", 0}, {"default", 0})),
+            OPT_INTRANGE("minch", min_channel_num, 0, 2, 6),
+            OPT_STRING("encoder", encoder, 0),
+            OPT_KEYVALUELIST("o", avopts, 0),
            {0}
        },
    },
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2013 Stefano Pigozzi <stefano.pigozzi@gmail.com>
+ *
+ * Based on Michael Niedermayer's lavcresample.
+ *
+ * This file is part of mpv.
+ *
+ * mpv is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+#include <math.h>
+#include <assert.h>
+
+#include "common/common.h"
+#include "config.h"
+
+#include "common/av_common.h"
+#include "common/msg.h"
+#include "filters/f_swresample.h"
+#include "filters/filter_internal.h"
+#include "filters/user_filters.h"
+#include "options/m_config.h"
+#include "options/m_option.h"
+#include "options/options.h"
+
+struct af_resample {
+    int allow_detach;
+    struct mp_resample_opts opts;
+    int global_normalize;
+};
+
+static void set_defaults(struct mpv_global *global, void *p)
+{
+    struct af_resample *s = p;
+
+    struct mp_resample_opts *opts = &s->opts;
+
+    struct mp_resample_opts *src_opts =
+        mp_get_config_group(s, global, &resample_conf);
+
+    s->global_normalize = src_opts->normalize;
+
+    assert(!opts->avopts); // we don't set a default value, so it must be NULL
+
+    *opts = *src_opts;
+
+    opts->avopts = NULL;
+    struct m_option dummy = {.type = &m_option_type_keyvalue_list};
+    m_option_copy(&dummy, &opts->avopts, &src_opts->avopts);
+}
+
+#define OPT_BASE_STRUCT struct af_resample
+
+static struct mp_filter *af_lavrresample_create(struct mp_filter *parent,
+                                                void *options)
+{
+    struct af_resample *s = options;
+
+    if (s->opts.normalize < 0)
+        s->opts.normalize = s->global_normalize;
+
+    struct mp_swresample *swr = mp_swresample_create(parent, &s->opts);
+    if (!swr)
+        abort();
+
+    MP_WARN(swr->f, "This filter is deprecated! Use the --audio-resample- options"
+            " to customize resampling, or the --af=aresample filter.\n");
+
+    talloc_free(s);
+    return swr->f;
+}
+
+const struct mp_user_filter_entry af_lavrresample = {
+    .desc = {
+        .description = "Sample frequency conversion using libavresample",
+        .name = "lavrresample",
+        .priv_size = sizeof(struct af_resample),
+        .priv_defaults = &(const struct af_resample) {
+            .opts = MP_RESAMPLE_OPTS_DEF,
+            .allow_detach = 1,
+        },
+        .options = (const struct m_option[]) {
+            OPT_INTRANGE("filter-size", opts.filter_size, 0, 0, 32),
+            OPT_INTRANGE("phase-shift", opts.phase_shift, 0, 0, 30),
+            OPT_FLAG("linear", opts.linear, 0),
+            OPT_DOUBLE("cutoff", opts.cutoff, M_OPT_RANGE, .min = 0, .max = 1),
+            OPT_FLAG("detach", allow_detach, 0), // does nothing
+            OPT_CHOICE("normalize", opts.normalize, 0,
+                    ({"no", 0}, {"yes", 1}, {"auto", -1})),
+            OPT_KEYVALUELIST("o", opts.avopts, 0),
+            {0}
+        },
+        .set_defaults = set_defaults,
+    },
+    .create = af_lavrresample_create,
+};
@@ -20,8 +20,6 @@

 #include <rubberband/rubberband-c.h>

-#include "config.h"
-
 #include "audio/aframe.h"
 #include "audio/format.h"
 #include "common/common.h"
@@ -33,7 +31,7 @@
 // command line options
 struct f_opts {
    int transients, detector, phase, window,
-        smoothing, formant, pitch, channels, engine;
+        smoothing, formant, pitch, channels;
    double scale;
 };

@@ -80,10 +78,7 @@ static bool init_rubberband(struct mp_filter *f)

    int opts = p->opts->transients | p->opts->detector | p->opts->phase |
               p->opts->window | p->opts->smoothing | p->opts->formant |
-               p->opts->pitch | p->opts->channels |
-#if HAVE_RUBBERBAND_3
-               p->opts->engine |
-#endif
+               p->opts->pitch | p-> opts->channels |
               RubberBandOptionProcessRealTime;

    int rate = mp_aframe_get_rate(p->pending);
@@ -336,45 +331,37 @@ const struct mp_user_filter_entry af_rubberband = {
            .transients = RubberBandOptionTransientsMixed,
            .formant = RubberBandOptionFormantPreserved,
            .channels = RubberBandOptionChannelsTogether,
-#if HAVE_RUBBERBAND_3
-            .engine = RubberBandOptionEngineFiner,
-#endif
        },
        .options = (const struct m_option[]) {
-            {"transients", OPT_CHOICE(transients,
-                {"crisp", RubberBandOptionTransientsCrisp},
-                {"mixed", RubberBandOptionTransientsMixed},
-                {"smooth", RubberBandOptionTransientsSmooth})},
-            {"detector", OPT_CHOICE(detector,
-                {"compound", RubberBandOptionDetectorCompound},
-                {"percussive", RubberBandOptionDetectorPercussive},
-                {"soft", RubberBandOptionDetectorSoft})},
-            {"phase", OPT_CHOICE(phase,
-                {"laminar", RubberBandOptionPhaseLaminar},
-                {"independent", RubberBandOptionPhaseIndependent})},
-            {"window", OPT_CHOICE(window,
-                {"standard", RubberBandOptionWindowStandard},
-                {"short", RubberBandOptionWindowShort},
-                {"long", RubberBandOptionWindowLong})},
-            {"smoothing", OPT_CHOICE(smoothing,
-                {"off", RubberBandOptionSmoothingOff},
-                {"on", RubberBandOptionSmoothingOn})},
-            {"formant", OPT_CHOICE(formant,
-                {"shifted", RubberBandOptionFormantShifted},
-                {"preserved", RubberBandOptionFormantPreserved})},
-            {"pitch", OPT_CHOICE(pitch,
-                {"quality", RubberBandOptionPitchHighQuality},
-                {"speed", RubberBandOptionPitchHighSpeed},
-                {"consistency", RubberBandOptionPitchHighConsistency})},
-            {"channels", OPT_CHOICE(channels,
-                {"apart", RubberBandOptionChannelsApart},
-                {"together", RubberBandOptionChannelsTogether})},
-#if HAVE_RUBBERBAND_3
-            {"engine", OPT_CHOICE(engine,
-                {"finer", RubberBandOptionEngineFiner},
-                {"faster", RubberBandOptionEngineFaster})},
-#endif
-            {"pitch-scale", OPT_DOUBLE(scale), M_RANGE(0.01, 100)},
+            OPT_CHOICE("transients", transients, 0,
+                    ({"crisp", RubberBandOptionTransientsCrisp},
+                     {"mixed", RubberBandOptionTransientsMixed},
+                     {"smooth", RubberBandOptionTransientsSmooth})),
+            OPT_CHOICE("detector", detector, 0,
+                    ({"compound", RubberBandOptionDetectorCompound},
+                     {"percussive", RubberBandOptionDetectorPercussive},
+                     {"soft", RubberBandOptionDetectorSoft})),
+            OPT_CHOICE("phase", phase, 0,
+                    ({"laminar", RubberBandOptionPhaseLaminar},
+                     {"independent", RubberBandOptionPhaseIndependent})),
+            OPT_CHOICE("window", window, 0,
+                    ({"standard", RubberBandOptionWindowStandard},
+                     {"short", RubberBandOptionWindowShort},
+                     {"long", RubberBandOptionWindowLong})),
+            OPT_CHOICE("smoothing", smoothing, 0,
+                    ({"off", RubberBandOptionSmoothingOff},
+                     {"on", RubberBandOptionSmoothingOn})),
+            OPT_CHOICE("formant", formant, 0,
+                    ({"shifted", RubberBandOptionFormantShifted},
+                     {"preserved", RubberBandOptionFormantPreserved})),
+            OPT_CHOICE("pitch", pitch, 0,
+                    ({"quality", RubberBandOptionPitchHighQuality},
+                     {"speed", RubberBandOptionPitchHighSpeed},
+                     {"consistency", RubberBandOptionPitchHighConsistency})),
+            OPT_CHOICE("channels", channels, 0,
+                    ({"apart", RubberBandOptionChannelsApart},
+                     {"together", RubberBandOptionChannelsTogether})),
+            OPT_DOUBLE("pitch-scale", scale, M_OPT_RANGE, .min = 0.01, .max = 100),
            {0}
        },
    },
@@ -30,7 +30,6 @@
 * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <float.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
@@ -48,7 +47,7 @@ struct f_opts {
    float scale_nominal;
    float ms_stride;
    float ms_search;
-    float factor_overlap;
+    float percent_overlap;
 #define SCALE_TEMPO 1
 #define SCALE_PITCH 2
    int speed_opt;
@@ -187,10 +186,10 @@ static int best_overlap_offset_s16(struct priv *s)
        ps  += s->samples_overlap - s->num_channels;
        long i  = -(s->samples_overlap - s->num_channels);
        do {
-            corr += ppc[i + 0] * (int64_t)ps[i + 0];
-            corr += ppc[i + 1] * (int64_t)ps[i + 1];
-            corr += ppc[i + 2] * (int64_t)ps[i + 2];
-            corr += ppc[i + 3] * (int64_t)ps[i + 3];
+            corr += ppc[i + 0] * ps[i + 0];
+            corr += ppc[i + 1] * ps[i + 1];
+            corr += ppc[i + 2] * ps[i + 2];
+            corr += ppc[i + 3] * ps[i + 3];
            i += 4;
        } while (i < 0);
        if (corr > best_corr) {
@@ -400,7 +399,7 @@ static bool reinit(struct mp_filter *f)

    update_speed(s, s->speed);

-    int frames_overlap = s->frames_stride * s->opts->factor_overlap;
+    int frames_overlap = s->frames_stride * s->opts->percent_overlap;
    if (frames_overlap <= 0) {
        s->bytes_standing   = s->bytes_stride;
        s->samples_standing = s->bytes_standing / bps;
@@ -538,8 +537,7 @@ static void reset(struct mp_filter *f)
    s->bytes_queued = 0;
    s->bytes_to_slide = 0;
    s->frames_stride_error = 0;
-    if (s->buf_overlap && s->bytes_overlap)
-        memset(s->buf_overlap, 0, s->bytes_overlap);
+    memset(s->buf_overlap, 0, s->bytes_overlap);
    TA_FREEP(&s->in);
 }

@@ -604,21 +602,21 @@ const struct mp_user_filter_entry af_scaletempo = {
        .priv_size = sizeof(OPT_BASE_STRUCT),
        .priv_defaults = &(const OPT_BASE_STRUCT) {
            .ms_stride = 60,
-            .factor_overlap = .20,
+            .percent_overlap = .20,
            .ms_search = 14,
            .speed_opt = SCALE_TEMPO,
            .scale_nominal = 1.0,
        },
        .options = (const struct m_option[]) {
-            {"scale", OPT_FLOAT(scale_nominal), M_RANGE(0.01, DBL_MAX)},
-            {"stride", OPT_FLOAT(ms_stride), M_RANGE(0.01, DBL_MAX)},
-            {"overlap", OPT_FLOAT(factor_overlap), M_RANGE(0, 1)},
-            {"search", OPT_FLOAT(ms_search), M_RANGE(0, DBL_MAX)},
-            {"speed", OPT_CHOICE(speed_opt,
-                {"pitch", SCALE_PITCH},
-                {"tempo", SCALE_TEMPO},
-                {"none", 0},
-                {"both", SCALE_TEMPO | SCALE_PITCH})},
+            OPT_FLOAT("scale", scale_nominal, M_OPT_MIN, .min = 0.01),
+            OPT_FLOAT("stride", ms_stride, M_OPT_MIN, .min = 0.01),
+            OPT_FLOAT("overlap", percent_overlap, M_OPT_RANGE, .min = 0, .max = 1),
+            OPT_FLOAT("search", ms_search, M_OPT_MIN, .min = 0),
+            OPT_CHOICE("speed", speed_opt, 0,
+                       ({"pitch", SCALE_PITCH},
+                        {"tempo", SCALE_TEMPO},
+                        {"none", 0},
+                        {"both", SCALE_TEMPO | SCALE_PITCH})),
            {0}
        },
    },
Author	SHA1	Message	Date
Jan Ekström	723fd02919	Release 0.29.1	2018-10-02 22:03:41 +03:00
Akemi	7c2368ad7d	cocoa-cb: fix side by side Split View when entering a Split View a windowDidEnterFullScreen event happens without a previous toggleFullScreen call. in that case it tries to stop an animation that was never initiated by us and basically breaks the system initiated fullscreen, or in this case the Split View. immediately after entering the fullscreen it tries top stop the animation and resizes the window, which causes the window to exit fullscreen. only try to stop an animation that was initiated by us and is safe to stop. (cherry picked from commit `2b0b9bb6a1`)	2018-10-02 20:36:55 +03:00
Rodger Combs	008ddf42a1	{mac,cocoa}: trim trailing null out of macosx_icon when loading it This prevents crashes when loading the application icon image. Suggested-by: Akemi <der.richter@gmx.de> (cherry picked from commit `1842a932d3`)	2018-10-02 00:42:58 +03:00
Rodger Combs	5b9cf1d0a6	mac: fix crash if we can't get an event tap without assistive-device permissions the event tap can't be create on 10.14 any more which lead to an assertion. System Preferences > Security & Privacy > Privacy > Accessibility and add mpv or your terminal App to the list. (cherry picked from commit `ada4f7c600`)	2018-10-02 00:42:51 +03:00
Niklas Haas	a985e8ed6b	encode: fix AVPacket deinitialization logic Since this function is called with packets on the stack, trying to free them makes no sense. Instead, it should unref (which is what `av_interleaved_write_frame` does anyway, rather than freeing). Also, the calling code tried unreffing the packet a second time, even after it was "freed" by the callee in the failure case - and after ownership was taken over by `av_interleaved_write_frame` in the successful case. Both of these cases were wrong. (cherry picked from commit `6d61c5f68a`)	2018-10-01 20:29:51 +03:00
wm4	36eeeecff6	demux_lavf: hack-fix EDL mp4 DASH hack I encountered a stream that fails with "Could not demux init fragment.". It turns out this is a regression from the recent change to that code. The assumption was that demux_lavf.c would treat this as concatenated stream - which it does, but not for probing. Doing this transparently is hard without doing it properly. Doing it properly would mean creating some sort of stream_concat (reminiscent of that FFmpeg security bug). I probably don't want to go there, and I think libavformat should just support this directly, so whatever. Hack-fix this with the knowledge that the init segment will always contain the headers. (cherry picked from commit `315004a38a`)	2018-10-01 18:55:06 +03:00
wm4	e74ffab36e	stream_libarchive: fix hangs when demuxer does out of bound seeks This happened with a .flac file inside an archive. It tried to seek beyond the end of the archive entry in a format where seeking isn't supported. stream_libarchive handles these situations by skipping data. But when the end of the archive is reached, archive_read_data() returns 0. While libarchive didn't bother to fucking document this, they do say it's supposed to work like read(), so I guess a return value of 0 really means EOF. So change the "< 0" to "<= 0". Also add some error logging. The same file actually worked without out of bounds reads when extracted, so there still might be something very wrong. (cherry picked from commit `7e85dc2167`)	2018-10-01 18:54:54 +03:00
wm4	4f47596043	demux_lavf: v4l streams are not seekable FFmpeg is retarded enough not to give us any indication whether it is (unless we query fields not in the ABI/API). I bet FFmpeg developers love it when library users have to litter their code with duplicated information. (cherry picked from commit `20d381d1e9`)	2018-10-01 18:54:27 +03:00
Akemi	3e8fd22f07	cocoa-cb: add Apple Software Renderer support by default the pixel format creation falls back to software renderer when everything fails. this is mostly needed for VMs. additionally one can directly request an sw renderer or exclude it entirely. (cherry picked from commit `8d2d0f0640`)	2018-09-30 23:38:11 +03:00
Akemi	53a1a955d7	cocoa-cb: move macOS option retrieval to the earliest point possible moved the retrieval of the macOS specific options from the backend initialisation to the initialisation of the CocoaCB class, the earliest point possible. this way macOS specific options can be used for the opengl context creation for example. (cherry picked from commit `44e49aee3c`)	2018-09-30 23:38:04 +03:00
Akemi	5a9add1fb3	add swift as main dependency so all dependencies can be disabled easily (cherry picked from commit `5c2056ad0a`)	2018-09-30 23:37:57 +03:00
Akemi	89e52a228c	build: check for Swift version and disable dependencies if needed (cherry picked from commit `50787acb27`)	2018-09-30 23:37:50 +03:00
Anton Kindestam	46969b449a	drm_atomic: Allow to create atomic context w/o drmprime video plane This is to improve the experience when running with default settings on a driver that doesn't have any overlay planes (or indeed only one plane), but still supports DRM atomic. Since the drmprime video plane is set to pick an overlay plane by default it would fail on these drivers due to not being able to create any atomic context. Users with such cards had to specify --drm-video-plane-id manually to some bogus value (it's not used after all). The "video" plane is only ever used by the drmprime-drm hwdec interop, which is not used at all in the typical usecase where everything is actually rendered on to the "OSD" plane using EGL, so having an atomic context without the "video" plane should be fine most of the time. (cherry picked from commit `810acf32d6`)	2018-09-30 17:16:40 +03:00
Anton Kindestam	ed9d644e06	manpage: minor fix to --drm-format Looking at other examples, a bar should be used when listing OPT_CHOICE options. (cherry picked from commit `f277f9f6d2`)	2018-09-30 17:16:33 +03:00
Tom Yan	5a7aca4be8	demux/packet: fix demux_packet_shorten for the rawaudio demuxer to do the expected gapless playback (cherry picked from commit `95636c65e7`)	2018-09-30 12:35:13 +03:00
Jan Ekström	af39f87258	travis: enable CI for release branches (cherry picked from commit `085943df25`)	2018-09-29 23:07:19 +03:00
Jan Ekström	e0682490d7	ao_alsa: log the ALSA state if we get a non-XRUN error The ALSA state generally can tell us more information in case we get an unexpected error. (cherry picked from commit `cea4ff3e5f`)	2018-09-29 23:07:19 +03:00
Jan Ekström	03e3abcb0c	ao_alsa: handle XRUNs separately from other errors According to ALSA doxy, EPIPE is a synonym to SND_PCM_STATE_XRUN, and that is a state that we should attempt to automatically recover from. In case recovery fails, log an error and return zero. A warning message will still be output for each XRUN since those are not something we should generally be receiving. (cherry picked from commit `fdc952486a`)	2018-09-29 23:07:19 +03:00
Jan Ekström	1dd77e41c1	ao_alsa: early exit get_space if paused or ALSA is not ready This has been way too long coming, and for me to notice that a whole lot of ao_alsa functions do an early return if the AO is paused. For the STATE_SETUP case, I had this reproduced once, and never since. Still, seems like we can start calling this function before the ALSA device has been fully initialized so we might as well early exit in that case. (cherry picked from commit `3218a58082`)	2018-09-29 23:07:19 +03:00
Ricardo Constantino	8e0b94e7eb	man/options: emphasize ytdl_hook's script options (cherry picked from commit `9c184078a6`)	2018-09-29 23:07:15 +03:00
Ricardo Constantino	0f7b08b0fc	ytdl_hook: fix audio not being picked up for some sites (cherry picked from commit `9dbab9661c`)	2018-09-29 23:06:49 +03:00
Niklas Haas	a8a4c7def7	ao_jack: only auto-connect to audio ports This prevents ao_jack from auto-connecting to MIDI ports (or other, hypothetical future port types). (cherry picked from commit `fed0ea111b`)	2018-09-29 23:06:49 +03:00
TSaaristo	c994a81aa4	encode: fix expected streams when using --lavfi-complex mpctx->current_track[0][STREAM_VIDEO] (and STREAM_AUDIO) are empty when using --lavfi-complex. Moving the muxer stream hinting after audio/video chain initialization and checking if the chains exist fixes encoding with --lavfi-complex. Previously, the output audio/video streams did not get prepared and the encode would fail due to unexpected stream addition. (cherry picked from commit `3744d0bda9`)	2018-09-29 23:06:49 +03:00
Niklas Haas	5ae13ad13b	mp_image: strip all HDR peak information from SDR clips By overriding it with 1.0 (aka SDR). This prevents blowing up on mistagged clips. Fixes #6111 (cherry picked from commit `48c38f730d`)	2018-09-29 23:06:49 +03:00
Tom Yan	0a92548684	ao_pulse: fix tlength calculation also remove the now unused non-sensical af_fmt_seconds_to_bytes. (cherry picked from commit `9d6b15ab32`)	2018-09-29 23:06:49 +03:00
Michael Hoang	56098c5636	Revert "ao_openal: enable building on OSX" This reverts commit `af6126adbe`. Apple's OpenAL support is ridiculously out of date, revert back to just using OpenAL Soft on macOS (fixes #4645). (cherry picked from commit `91786fa99c`)	2018-09-29 23:06:49 +03:00
Niklas Haas	312b88d360	vo_gpu: avoid overwriting compute shader block sizes When using multiple compute shaders as part of the same pass, there can be a conflict in the block sizes. In the problematic case, the HDR detection shader can collide with the polar sampling shader. In this case, the solution is clear - the passes that can handle any size should "give in" and not overwrite the block sizes. Fixes #6083. (cherry picked from commit `1890ca024e`)	2018-09-29 23:06:49 +03:00
Hector Martin	b97f172faa	af_rubberband: reset delay to 0 on reset This fixes A-V drift on seeking (cherry picked from commit `a10754f038`)	2018-09-29 23:06:49 +03:00
Anton Kindestam	f3a58e5f4a	manpage: fix reference to --tone-mapping by old option name (cherry picked from commit `d2d7dba6ee`)	2018-09-29 23:06:49 +03:00
Ricardo Constantino	49606f5a3b	ytdl_hook: always load ytdl:// links with ytdl_hook first Suggested in IRC by sfan5. (cherry picked from commit `d8131568c8`)	2018-09-29 23:06:03 +03:00
Michael Hoang	7d5468ace3	osx: Fix initialization and access of service menu Replace dot syntax with accessor syntax so that clang no longer errors out due to not finding the property servicesMenu on NSApp. (cherry picked from commit `4e9e46b9f8`)	2018-09-29 22:22:20 +03:00
Akemi	a4e7580c5a	cocoa-cb: fix crash on macOS 10.10 the colorspace of the layer is only available on 10.11 and upwards. Fixes #6041 (cherry picked from commit `049816c145`)	2018-09-29 22:22:20 +03:00
Akemi	7b91bf7f20	cocoa-cb: fix crash when no screen is available instead of force unwrapping and chaining the optional vars in our containsMouseLocation function, safely unwrap and guard the resulting var. Fixes #6062 (cherry picked from commit `6bf0edc59c`)	2018-09-29 22:22:20 +03:00
Tom Yan	4243d06761	audio/format: decouple af_fmt_is_planar from af_fmt_to_planar so that af_fmt_to_planar (and hence af_fmt_from_planar) can just return the input when it is not an interleaved (planar) format. (cherry picked from commit `f2311ff514`)	2018-09-29 22:22:20 +03:00
jaseg	4d074a960d	manpage: Correct show-text duration default value duration is parsed as an integer, and the default value is used if ```-1``` is passed. Passing ```-``` as described here causes a parameter value error. (cherry picked from commit `cfecbac863`)	2018-09-29 22:22:20 +03:00
pavelxdd	071556efee	manpage: fix --vf exclamation mark description An exclamation mark disables the filter by default instead of enabling it. (cherry picked from commit `759a6a259e`)	2018-09-29 22:22:20 +03:00
Tom Yan	876341417a	audio/format: minor fix for af_fmt_from_planar See af_fmt_to_planar. (cherry picked from commit `4e91cb72ef`)	2018-09-29 22:22:20 +03:00
Martin Herkt	6a57e1a298	ci: explicitly call waf with python3 Python 2 may not be present in the CI images in the future, but waf’s shebang line still uses its executable name. Explicitly call the right major version of the interpreter. (cherry picked from commit `6eb59fea2f`)	2018-09-29 22:22:20 +03:00
Jan Ekström	0e316d7032	ci: do bootstrap outside the docker container This way the docker container in itself does no networking. It seems like travis disabled network access from the actual docker containers. (cherry picked from commit `2d785f3ea3`)	2018-09-29 22:22:20 +03:00
Yclept Nemo	0914da082f	stream_smb/stream_file: fix `write_buffer` Functions `write` and `smbc_write` are given a diminishing buffer of incorrect constant size. After partial writes, the code would do another write of the full original length, failing to subtract the amount already written.	2018-07-29 12:59:03 +03:00
Yclept Nemo	021bea1592	stream_smb: locking to bypass libsmbclient issues Thread-unsafe libsmbclient is likely to crash when used simultaneously across threads. For example, by: mpv "smb://...mkv" --sub-file "smb://...srt" Work around this by locking all calls to this library under a single global mutex. This is a temporary solution. When the libsmbclient bug [1] is fixed, switch to the code from branch [2] which uses a new api to create per-thread smb contexts. Fixes [3]. [1] https://bugzilla.samba.org/show_bug.cgi?id=11413 [2] https://github.com/orbisvicis/mpv/tree/smbclient_threaded_api [3] https://github.com/mpv-player/mpv/issues/5936 (cherry picked from commit `112b3fa922`)	2018-07-29 12:59:03 +03:00
Daniel M. Capella	0d134dc010	manpage: fixup mistaken show playlist/track-list shortcuts This was mistaken in `496b13227b` and not noticed in review. (cherry picked from commit `45beb7073a`)	2018-07-23 01:33:53 +03:00
@@ -1 +1 @@
 .37.0
 .29.1