Skip to content

V
vlc
Commit 0c180b06 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Don't put VPX in any default contrib 

VLC would not be redistributable.
parent 1834c5a7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
extras/contrib/src/Distributions/darwin.mak
View file @ 0c180b06
# Darwin rules # Darwin rules
all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
.fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ .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 \ .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
.png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \ .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
.SDL_image .gecko .mpcdec .dirac_encoder .dirac_decoder \ .SDL_image .gecko .mpcdec .dirac_encoder .dirac_decoder \
......
extras/contrib/src/Distributions/darwin64.mak
View file @ 0c180b06
# Darwin rules # Darwin rules
all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
.fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ .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 \ .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
.png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \ .png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
.gecko .mpcdec .dirac_encoder .dirac_decoder \ .gecko .mpcdec .dirac_encoder .dirac_decoder \
......
extras/contrib/src/Makefile
View file @ 0c180b06
...@@ -149,7 +149,6 @@ endif ...@@ -149,7 +149,6 @@ endif
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
X264CONF=--host=$(HOST) X264CONF=--host=$(HOST)
X264CONF += --enable-pic X264CONF += --enable-pic
FFMPEGCONF += --enable-libvpx
ifdef HAVE_DARWIN_32 ifdef HAVE_DARWIN_32
FFMPEGCONF += --cc=gcc-4.0 FFMPEGCONF += --cc=gcc-4.0
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment