build: make it easier to force FFmpeg upstream

Apparently some people want this. Actually making it compile is still
their problem, though, and I expect that build with FFmpeg upstream will
occasionally be broken (as it is right now). This is because mpv also
relies on API provided by Libav, and if FFmpeg hasn't merged that yet,
it's not our problem - we provide a version of FFmpeg upstream with
those changes merged, and it's called ffmpeg-mpv.

Also adjust the README which still talked about FFmpeg releases.

1 files changed, 7 insertions, 6 deletions

diff --git a/wscript b/wscript
index 5a389f16f2..19d9413657 100644
--- a/wscript
+++ b/wscript
@@ -458,21 +458,22 @@ libav_dependencies = [
         'req': True,
         'fmsg': "FFmpeg/Libav development files not found.",
     }, {
-        'name': 'ffmpeg_mpv',
+        '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_garbage',
-        'deps': '!ffmpeg_mpv',
+        'name': '--ffmpeg-garbage',
+        'deps': '!ffmpeg-mpv',
         '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')
+                                use='libavcodec'),
+        'default': 'disable',
     }, {
-        # This check should always result in the opposite of is_ffmpeg.
+        # This check should always result in the opposite of ffmpeg-*.
         # Run it to make sure is_ffmpeg didn't fail for some other reason than
         # the actual version check.
         'name': 'libav',
@@ -484,7 +485,7 @@ libav_dependencies = [
     }, {
         'name': 'libav-any',
         'desc': 'Libav/FFmpeg library versions',
-        'deps': 'ffmpeg_mpv || libav',
+        'deps': 'ffmpeg-mpv || ffmpeg-garbage || libav',
         'func': check_ffmpeg_or_libav_versions(),
         'req': True,
         'fmsg': "Unable to find development files for some of the required \