[vlc-devel] commit: Don't disable ffmpeg' s support of libmp3lame and libfaac as pointed by funman. ( Felix Paul Kühne )

[git version control]

vlc | branch: 0.8.6-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Sat May 24 02:30:03 2008 +0200| [44d7927a42f9981c5fbf71ef459944ae06165bdd]

Don't disable ffmpeg's support of libmp3lame and libfaac as pointed by funman.

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

 extras/contrib/src/Makefile     |    8 +++++---
 extras/contrib/src/packages.mak |    4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 1c1ce95..fbb7953 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -111,6 +111,8 @@ endif
 ifdef HAVE_WINCE
 HOSTCONF+= --without-pic --disable-shared
 FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
+else
+FFMPEGCONF+= --enable-libmp3lame --enable-libfaac
 endif
 
 ifdef HAVE_BEOS
@@ -135,9 +137,9 @@ ifdef HAVE_DARWIN_OS
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
 	.dvdcss .dvdnav .dvdread .dvbpsi .live .x264 .caca .mod \
-	.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
-	.glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \
-        .libdca .goom2k4 .x264
+	.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager \
+	.SDL_image .glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder  \
+    .libdca .goom2k4 .x264 .aclocal
 # .expat .clinkcc don't work with SDK yet
 # .glib .libidl .gecko are required to build the mozilla plugin
 # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 68d8cbf..9575c6a 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -159,8 +159,8 @@ SDL_URL=$(SF)/libsdl/SDL-$(SDL_VERSION).tar.gz
 SDL_IMAGE_VERSION=1.2.5
 SDL_IMAGE_URL=$(SF)/libsdl/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 MUSE_VERSION=1.2.2
-#MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
-MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
+MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
+#MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
 WXWIDGETS_VERSION=2.6.4
 WXWIDGETS_URL=$(SF)/wxwindows/wxWidgets-$(WXWIDGETS_VERSION).tar.gz
 ZLIB_VERSION=1.2.3