diff options
author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2017-12-05 08:25:00 +0000 |
---|---|---|
committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2017-12-05 08:27:55 +0000 |
commit | f19797dea62ab9619a18a2ffab1b67bdafe55b8c (patch) | |
tree | bc9c16a11530a1d0415bcf8f8bbe9ca7b947f0c3 /wscript | |
parent | a743fef837bcab206b1e576db7e7a64b02890449 (diff) | |
download | mpv-f19797dea62ab9619a18a2ffab1b67bdafe55b8c.tar.bz2 mpv-f19797dea62ab9619a18a2ffab1b67bdafe55b8c.tar.xz |
Remove support for ffmpeg-mpv
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 17 |
1 files changed, 4 insertions, 13 deletions
@@ -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', |