From 27ab99dc3e37c4692a204d410ac2a0959b40a458 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 1 Nov 2017 18:19:06 +0100
Subject: build: garbage => upstream

"garbage" is considered offensive. The result will still be pretty bad
though (currently build failures).
---
 wscript | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wscript b/wscript
index 19d9413657..9f7e0e106e 100644
--- a/wscript
+++ b/wscript
@@ -464,7 +464,7 @@ libav_dependencies = [
                                 'int x[LIBAVCODEC_MPV ? 1 : -1]',
                                 use='libavcodec')
     }, {
-        'name': '--ffmpeg-garbage',
+        'name': '--ffmpeg-upstream',
         'deps': '!ffmpeg-mpv',
         'desc': 'libav* is upstream FFmpeg (unsupported)',
         # FFmpeg <=> LIBAVUTIL_VERSION_MICRO>=100
@@ -485,7 +485,7 @@ libav_dependencies = [
     }, {
         'name': 'libav-any',
         'desc': 'Libav/FFmpeg library versions',
-        'deps': 'ffmpeg-mpv || ffmpeg-garbage || libav',
+        'deps': 'ffmpeg-mpv || ffmpeg-upstream || libav',
         'func': check_ffmpeg_or_libav_versions(),
         'req': True,
         'fmsg': "Unable to find development files for some of the required \
-- 
cgit v1.2.3