Remove support for ffmpeg-mpv

DOCS/man/options.rst

@@ -731,7 +731,7 @@ Video
     FFmpeg decoders for file parsing. Experimental, is known not to correctly
     check whether decoding is supported by the hardware at all. Deinterlacing
     is not supported. Since this uses FFmpeg's codec parsers, it is expected
-    that this generally causes fewer issues than ``cuda``. Requires ffmpeg-mpv.
+    that this generally causes fewer issues than ``cuda``.
 
     Most video filters will not work with hardware decoding as they are
     primarily implemented on the CPU. Some exceptions are ``vdpaupp``,

README.md

@@ -100,7 +100,7 @@ Essential dependencies (incomplete list):
   libGL, GLX, EGL, xv, ...)
 - Audio output development headers (libasound/ALSA, pulseaudio)
 - FFmpeg libraries (libavutil libavcodec libavformat libswscale libavfilter
-  and either libswresample or libavresample) from ffmpeg-mpv or Libav
+  and either libswresample or libavresample)
 - zlib
 - iconv (normally provided by the system libc)
 - libass (OSD, OSC, text subtitles)
@@ -126,11 +126,10 @@ FFmpeg dependencies:
 - Libav also works, but some features will not work. (See section below.)
 
 Most of the above libraries are available in suitable versions on normal
-Linux distributions. However, FFmpeg is an exception - [ffmpeg-mpv][ffmpeg-mpv]
-or Libav git master is required. For that reason you may want to use
-the separately available build wrapper ([mpv-build][mpv-build]) that first
-compiles FFmpeg libraries and libass, and then compiles the player statically
-linked against those.
+Linux distributions. For ease of compiling the latest git master of everything,
+you may wish to use the separately available build wrapper ([mpv-build][mpv-build])
+which first compiles FFmpeg libraries and libass, and then compiles the player
+statically linked against those.
 
 If you want to build a Windows binary, you either have to use MSYS2 and MinGW,
 or cross-compile from Linux with MinGW. See
@@ -145,17 +144,6 @@ of both FFmpeg and Libav. But FFmpeg is preferred, and some mpv features work
 with FFmpeg only (subtitle formats in particular).
 
 
-## Preferred FFmpeg version
-
-Only [ffmpeg-mpv][ffmpeg-mpv] is supported. Upstream FFmpeg can be forced by
-passing a certain switch to configure, but compilation or runtime behavior
-might be broken at times.
-
-_If_ you force upstream FFmpeg, and it doesn't work, please contact upstream
-FFmpeg for help, instead of mpv. See
-[FFmpeg contact](http://ffmpeg.org/contact.html#MailingLists) on how to contact
-FFmpeg upstream.
-
 ## FFmpeg ABI compatibility
 
 mpv does not support linking against FFmpeg versions it was not built with, even
@@ -246,4 +234,3 @@ only if discretion is required.
 [api-changes]: https://github.com/mpv-player/mpv/blob/master/DOCS/client-api-changes.rst
 [restore-old-bindings]: https://github.com/mpv-player/mpv/blob/master/etc/restore-old-bindings.conf
 [contribute.md]: https://github.com/mpv-player/mpv/blob/master/DOCS/contribute.md
-[ffmpeg-mpv]: https://github.com/mpv-player/ffmpeg-mpv

TOOLS/appveyor-install.sh

@@ -27,9 +27,9 @@ pacman -S --noconfirm --needed \
 # Delete unused packages to reduce space used in the Appveyor cache
 pacman -Sc --noconfirm
 
-# Compile ffmpeg-mpv
+# Compile ffmpeg
 (
-    git clone --depth=1 https://github.com/mpv-player/ffmpeg-mpv.git && cd ffmpeg-mpv
+    git clone --depth=1 https://git.ffmpeg.org/ffmpeg.git && cd ffmpeg
 
     mkdir build && cd build
     ../configure \

TOOLS/travis-deps

@@ -93,7 +93,7 @@ class Libav < TravisDepsBuilder
       },
       "ffmpeg-git" => {
         :action => :git,
-        :url    => "git://github.com/mpv-player/ffmpeg-mpv.git"
+        :url    => "git://git.ffmpeg.org/ffmpeg.git"
       }
     }
   end

wscript

@@ -444,15 +444,8 @@ libav_dependencies = [
         'req': True,
         'fmsg': "FFmpeg/Libav development files not found.",
     }, {
-        'name': 'ffmpeg-mpv',
-        'desc': 'libav* is FFmpeg mpv modified version',
-        'func': check_statement('libavcodec/version.h',
-                                'int x[LIBAVCODEC_MPV ? 1 : -1]',
-                                use='libavcodec')
-    }, {
-        'name': '--ffmpeg-upstream',
-        'deps': '!ffmpeg-mpv',
-        'desc': 'libav* is upstream FFmpeg (unsupported)',
+        'name': 'ffmpeg',
+        'desc': 'libav* is FFmpeg',
         # FFmpeg <=> LIBAVUTIL_VERSION_MICRO>=100
         'func': check_statement('libavcodec/version.h',
                                 'int x[LIBAVCODEC_VERSION_MICRO >= 100 ? 1 : -1]',
@@ -470,13 +463,11 @@ libav_dependencies = [
     }, {
         'name': 'libav-any',
         'desc': 'Libav/FFmpeg library versions',
-        'deps': 'ffmpeg-mpv || ffmpeg-upstream || libav',
+        'deps': 'ffmpeg || libav',
         'func': check_ffmpeg_or_libav_versions(),
         'req': True,
         'fmsg': "Unable to find development files for some of the required \
-FFmpeg/Libav libraries. You need git master. For FFmpeg, the mpv fork, that \
-might contain additional fixes and features is required. It is available on \
-https://github.com/mpv-player/ffmpeg-mpv Aborting."
+FFmpeg/Libav libraries. Git master is recommended."
     }, {
         'name': '--libavdevice',
         'desc': 'libavdevice',