Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
96ea9d8f
Commit
96ea9d8f
authored
Nov 01, 2010
by
Rafaël Carré
Committed by
Jean-Baptiste Kempf
Nov 01, 2010
Browse files
Contribs: do not build libvpx decoder
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
b6c9bd51
Changes
1
Hide whitespace changes
Inline
Side-by-side
extras/contrib/src/contrib-src.mak
View file @
96ea9d8f
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment