Merge branch 'base' into master

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index beb7d9d8a21422c827bc1fef8fe115967e226dc4..b93e5e398287ef4ceda7848bfbce582b81d1c941 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -133,7 +133,8 @@ endif
 FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp
 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
-FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-libgsm
+FFMPEGCONF+= --enable-libmp3lame --enable-libgsm
+#--enable-libfaac
 endif
 
 ifdef HAVE_BEOS