Commit 96ea9d8f authored by Rafaël Carré's avatar Rafaël Carré Committed by Jean-Baptiste Kempf
Browse files

Contribs: do not build libvpx decoder


Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent b6c9bd51
...@@ -90,7 +90,7 @@ else ...@@ -90,7 +90,7 @@ else
HOSTCC2=$(HOSTCC) HOSTCC2=$(HOSTCC)
endif endif
FFMPEGCONF=--disable-doc FFMPEGCONF=--disable-doc --disable-decoder=libvpx
# cross compiling # cross compiling
#This should be inside the if block but some config scripts are buggy #This should be inside the if block but some config scripts are buggy
...@@ -155,6 +155,7 @@ endif ...@@ -155,6 +155,7 @@ 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
...@@ -1035,7 +1036,7 @@ FFMPEGCONF += \ ...@@ -1035,7 +1036,7 @@ FFMPEGCONF += \
--disable-avfilter \ --disable-avfilter \
--disable-network --disable-network
ifdef HAVE_WIN64 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 else
ifdef HAVE_WIN32 ifdef HAVE_WIN32
FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs --enable-libvpx FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs --enable-libvpx
......
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