[vlc-commits] contrib: ffmpeg: don't use libvpx at all in libavcodec

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Mar 29 15:46:50 2018 +0200| [65d67548fd553dd540533a119bf4c06c447d6b6d] | committer: Hugo Beauzée-Luyssen

contrib: ffmpeg: don't use libvpx at all in libavcodec

We have our own decoder/encoder

(cherry picked from commit 668d0178dd264e3b117ab4858515d0a6030e8b1b)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

 contrib/src/ffmpeg/rules.mak | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 2f76ccee15..0980142a16 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -35,6 +35,7 @@ FFMPEGCONF = \
 	--disable-protocol=concat \
 	--disable-bsfs \
 	--disable-bzlib \
+	--disable-libvpx \
 	--disable-avresample \
 	--enable-bsf=vp9_superframe
 
@@ -65,11 +66,8 @@ ifndef BUILD_NETWORK
 FFMPEGCONF += --disable-network
 endif
 ifdef BUILD_ENCODERS
-FFMPEGCONF += --enable-libmp3lame --enable-libvpx --disable-decoder=libvpx_vp8 --disable-decoder=libvpx_vp9
-ifndef USE_FFMPEG
-FFMPEGCONF += --disable-decoder=libvpx
-endif
-DEPS_ffmpeg += lame $(DEPS_lame) vpx $(DEPS_vpx)
+FFMPEGCONF += --enable-libmp3lame
+DEPS_ffmpeg += lame $(DEPS_lame)
 else
 FFMPEGCONF += --disable-encoders --disable-muxers
 endif