[vlc-commits] Contribs: deactivate libavcodec vorbis encoder

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Oct 12 11:17:53 2012 +0200| [9c64ad3466ba3fecc421894de284093fd1c25e58] | committer: Jean-Baptiste Kempf

Contribs: deactivate libavcodec vorbis encoder

Its quality is really bad, and we have the native one...

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

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

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 3ab782d..5a16552 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -7,6 +7,7 @@ FFMPEGCONF = \
 	--cc="$(CC)" \
 	--disable-doc \
 	--disable-decoder=bink \
+	--disable-encoder=vorbis \
 	--enable-libgsm \
 	--enable-libopenjpeg \
 	--disable-debug \
@@ -74,7 +75,7 @@ FFMPEGCONF += --cpu=core2
 endif
 endif
 ifdef HAVE_IOS
-FFMPEGCONF += --enable-pic --as="$(AS)" --disable-decoder=snow
+FFMPEGCONF += --enable-pic --as="$(AS)"
 endif
 
 # Linux
@@ -101,7 +102,7 @@ DEPS_ffmpeg += directx
 endif
 FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack
 FFMPEGCONF += --enable-w32threads --enable-dxva2 \
-	--disable-decoder=dca --disable-encoder=vorbis \
+	--disable-decoder=dca
 
 ifdef HAVE_WIN64
 FFMPEGCONF += --cpu=athlon64 --arch=x86_64