[vlc-commits] contrib: ffmpeg: only use libvpx when building encoders

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Nov 27 02:51:02 2011 -0500| [ababf11935d7ca4f5073cd9374da4409e79d917c] | committer: Rafaël Carré

contrib: ffmpeg: only use libvpx when building encoders

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

 contrib/src/ffmpeg/rules.mak |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 45dc379..7622360 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -8,7 +8,6 @@ FFMPEGCONF = \
 	--disable-doc \
 	--disable-decoder=libvpx \
 	--enable-libgsm \
-	--enable-libvpx \
 	--enable-libopenjpeg \
 	--disable-debug \
 	--enable-gpl \
@@ -22,12 +21,12 @@ FFMPEGCONF = \
 	--disable-protocols \
 	--disable-avfilter \
 	--disable-network
-DEPS_ffmpeg = zlib gsm vpx $(DEPS_vpx) openjpeg
+DEPS_ffmpeg = zlib gsm openjpeg
 
 # Optional dependencies
 ifdef BUILD_ENCODERS
-FFMPEGCONF += --enable-libmp3lame
-DEPS_ffmpeg += lame $(DEPS_lame)
+FFMPEGCONF += --enable-libmp3lame --enable-libvpx
+DEPS_ffmpeg += lame $(DEPS_lame) vpx $(DEPS_vpx)
 else
 FFMPEGCONF += --disable-encoders --disable-muxers
 # XXX: REVISIT --enable-small ?