From: Rafaël Carré <funman@videolan.org>
Date: Sun, 27 Nov 2011 07:51:02 +0000 (-0500)
Subject: contrib: ffmpeg: only use libvpx when building encoders
X-Git-Tag: 1.3.0-git~17
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ababf11935d7ca4f5073cd9374da4409e79d917c;p=vlc

contrib: ffmpeg: only use libvpx when building encoders
---

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 45dc3798af..7622360a00 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 ?