[vlc-commits] contrib: ffmpeg doesn't support --disable-decoder=libvpx

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Feb 13 12:22:18 2017 +0100| [386d7ac4b00f45e10762c150d74b41d9e2c1fd85] | committer: Hugo Beauzée-Luyssen

contrib: ffmpeg doesn't support --disable-decoder=libvpx

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

 contrib/src/ffmpeg/rules.mak | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 367bc49..5e98e0b 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -49,7 +49,10 @@ ifndef BUILD_NETWORK
 FFMPEGCONF += --disable-network
 endif
 ifdef BUILD_ENCODERS
-FFMPEGCONF += --enable-libmp3lame --enable-libvpx --disable-decoder=libvpx --disable-decoder=libvpx_vp8 --disable-decoder=libvpx_vp9
+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)
 else
 FFMPEGCONF += --disable-encoders --disable-muxers