From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 29 May 2010 11:18:48 +0000 (+0300)
Subject: Don't put VPX in any default contrib
X-Git-Tag: 1.2.0-pre1~6439
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0c180b069320dd9d197a43a934b561cbd8a3bfbc;p=vlc

Don't put VPX in any default contrib

VLC would not be redistributable.
---

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 8ec5dce6fd..13478f670d 100644
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -1,7 +1,7 @@
 # Darwin rules
 all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
     .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-    .flac .speex .shout .faad .lame .twolame .ebml .matroska .vpx .ffmpeg \
+    .flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \
     .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
     .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
     .SDL_image .gecko .mpcdec .dirac_encoder .dirac_decoder \
diff --git a/extras/contrib/src/Distributions/darwin64.mak b/extras/contrib/src/Distributions/darwin64.mak
index 0c94a3b4ec..019e0ffc79 100644
--- a/extras/contrib/src/Distributions/darwin64.mak
+++ b/extras/contrib/src/Distributions/darwin64.mak
@@ -1,7 +1,7 @@
 # Darwin rules
 all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
     .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-    .flac .speex .shout .faad .lame .twolame .ebml .matroska .vpx .ffmpeg \
+    .flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \
     .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
     .png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
     .gecko .mpcdec .dirac_encoder .dirac_decoder \
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 23b343bcd8..6140c1d6b0 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -149,7 +149,6 @@ endif
 ifdef HAVE_DARWIN_OS
 X264CONF=--host=$(HOST)
 X264CONF += --enable-pic
-FFMPEGCONF += --enable-libvpx
 ifdef HAVE_DARWIN_32
 FFMPEGCONF += --cc=gcc-4.0
 else