Skip to content

Commit

Permalink
Revert "build: require our own ffmpeg repo"
Browse files Browse the repository at this point in the history
This reverts commit 83d44ac.
  • Loading branch information
orbea committed Oct 29, 2017
1 parent 6b74576 commit 12821bb
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions wscript
Expand Up @@ -462,18 +462,12 @@ libav_dependencies = [
'req': True,
'fmsg': "FFmpeg/Libav development files not found.",
}, {
'name': 'is_ffmpeg_garbage',
'desc': 'libav* is upstream FFmpeg (unsupported)',
'name': 'is_ffmpeg',
'desc': 'libav* is FFmpeg',
# 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
Expand All @@ -491,9 +485,7 @@ 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}. 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)
FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_string)
}, {
'name': '--libavdevice',
'desc': 'libavdevice',
Expand Down

0 comments on commit 12821bb

Please sign in to comment.