[vlc-commits] contrib: ffmpeg: account for libvpx decoders name change

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jan 15 07:13:58 2013 +0100| [e10b28cd04598e7b1cd8a0225afd49cc01f9d3fc] | committer: Rafaël Carré

contrib: ffmpeg: account for libvpx decoders name change

'libvpx' decoder doesn't exist anymore but we continue to disable it anyway
for people building and older version

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

 contrib/src/ffmpeg/rules.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 7c78972..61477f8 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -28,7 +28,7 @@ DEPS_ffmpeg = zlib gsm openjpeg
 
 # Optional dependencies
 ifdef BUILD_ENCODERS
-FFMPEGCONF += --enable-libmp3lame --enable-libvpx --disable-decoder=libvpx
+FFMPEGCONF += --enable-libmp3lame --enable-libvpx --disable-decoder=libvpx --disable-decoder=libvpx_vp8 --disable-decoder=libvpx_vp9
 DEPS_ffmpeg += lame $(DEPS_lame) vpx $(DEPS_vpx)
 else
 FFMPEGCONF += --disable-encoders --disable-muxers