contrib: ffmpeg: only use libvpx when building encoders

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 45dc3798af798cc39b97585ec3be760f68ac1b1c..7622360a00bbb7995f9e7d294af0a1d41fb9e338 100644 (file)
--- 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 ?