From ababf11935d7ca4f5073cd9374da4409e79d917c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Sun, 27 Nov 2011 02:51:02 -0500 Subject: [PATCH] contrib: ffmpeg: only use libvpx when building encoders --- contrib/src/ffmpeg/rules.mak | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 ? -- 2.39.2