diff options
author | wm4 <wm4@nowhere> | 2017-10-27 18:04:24 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-10-27 18:08:40 +0200 |
commit | 83d44aca7dc7f46b8d3b64d441f5a8317a40e080 (patch) | |
tree | 17ac4a6c6bcd01c439729c10326620646d297f0e /wscript | |
parent | f36d152eb7fed4cee9e2f0f37370fddfdfe2cef6 (diff) |
build: require our own ffmpeg repo
This is required now. Can't have FFmpeg upstream randomly break us and
then not fix it (like this recent EOF issue).
Upstream FFmpeg is of course still supported, but you will need to edit
the build scripts. Official support is only with the master branch of
our own repo.
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -462,13 +462,19 @@ libav_dependencies = [ 'req': True, 'fmsg': "FFmpeg/Libav development files not found.", }, { - 'name': 'is_ffmpeg', - 'desc': 'libav* is FFmpeg', + 'name': 'is_ffmpeg_garbage', + 'desc': 'libav* is upstream FFmpeg (unsupported)', # FFmpeg <=> LIBAVUTIL_VERSION_MICRO>=100 'func': check_statement('libavcodec/version.h', 'int x[LIBAVCODEC_VERSION_MICRO >= 100 ? 1 : -1]', use='libavcodec') }, { + 'name': 'is_ffmpeg', + 'desc': 'libav* is FFmpeg mpv modified version', + 'func': check_statement('libavcodec/version.h', + 'int x[LIBAVCODEC_MPV ? 1 : -1]', + use='libavcodec') + }, { # This check should always result in the opposite of is_ffmpeg. # Run it to make sure is_ffmpeg didn't fail for some other reason than # the actual version check. @@ -485,7 +491,9 @@ libav_dependencies = [ 'func': check_ffmpeg_or_libav_versions(), 'req': True, 'fmsg': "Unable to find development files for some of the required \ -FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_string) +FFmpeg/Libav libraries. You need at least {0}. 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.".format(libav_versions_string) }, { 'name': '--libavdevice', 'desc': 'libavdevice', |