[vlc-devel] commit: Contrib: remove faac from ffmpeg ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Tue May 26 23:01:03 2009 +0300| [b381e4a4c9b3b8031fe0af7a6620ceea34ddd13d] | committer: Rémi Denis-Courmont 

Contrib: remove faac from ffmpeg

Without this, ffmpeg refuses to build due to licensing problems.

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

 extras/contrib/src/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f1e1446..31a7f99 100644
--- 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