From 0c180b069320dd9d197a43a934b561cbd8a3bfbc Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 29 May 2010 14:18:48 +0300 Subject: [PATCH] Don't put VPX in any default contrib VLC would not be redistributable. --- extras/contrib/src/Distributions/darwin.mak | 2 +- extras/contrib/src/Distributions/darwin64.mak | 2 +- extras/contrib/src/Makefile | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) 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 -- 2.39.2