[vlc-commits] commit: Contribs: do not build libvpx decoder ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Nov  1 17:15:35 2010 +0100| [96ea9d8f0e6999ee72e01d299ef70b2dbffb6d05] | committer: Jean-Baptiste Kempf 

Contribs: do not build libvpx decoder

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=96ea9d8f0e6999ee72e01d299ef70b2dbffb6d05
---

 extras/contrib/src/contrib-src.mak |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 50b21b0..585843f 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -90,7 +90,7 @@ else
 HOSTCC2=$(HOSTCC)
 endif
 
-FFMPEGCONF=--disable-doc
+FFMPEGCONF=--disable-doc --disable-decoder=libvpx
 
 # cross compiling
 #This should be inside the if block but some config scripts are buggy
@@ -155,6 +155,7 @@ endif
 ifdef HAVE_DARWIN_OS
 X264CONF=--host=$(HOST)
 X264CONF += --enable-pic
+FFMPEGCONF += --enable-libvpx
 ifdef HAVE_DARWIN_32
 FFMPEGCONF += --cc=gcc-4.0
 else
@@ -1035,7 +1036,7 @@ FFMPEGCONF += \
 	--disable-avfilter \
 	--disable-network
 ifdef HAVE_WIN64
-FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --disable-dxva2 --disable-bsfs 
+FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --disable-dxva2 --disable-bsfs
 else
 ifdef HAVE_WIN32
 FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs --enable-libvpx