From f19797dea62ab9619a18a2ffab1b67bdafe55b8c Mon Sep 17 00:00:00 2001
From: Rostislav Pehlivanov <atomnuker@gmail.com>
Date: Tue, 5 Dec 2017 08:25:00 +0000
Subject: Remove support for ffmpeg-mpv

---
 wscript | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'wscript')

diff --git a/wscript b/wscript
index 0ee9d8639b..8db26d5b1c 100644
--- a/wscript
+++ b/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',
-- 
cgit v1.2.3