[vlc-devel] commit: Faac is NOT compatible with VLC (Jean-Baptiste Kempf )

Axel Voss voax at ymail.com
Fri Aug 28 10:45:17 CEST 2009 

Why? Can you explaine?
Thanks Axel




________________________________
From: git version control <git at videolan.org>
To: vlc-devel at videolan.org
Sent: Thursday, August 27, 2009 7:34:45 PM
Subject: [vlc-devel] commit: Faac is NOT compatible with VLC (Jean-Baptiste Kempf )

vlc | branch: 1.0-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jul 10 17:30:10 2009 +0200| [42a4c709369bd7567e21acc533a21b78a5dcf430] | committer: Rémi Denis-Courmont 

Faac is NOT compatible with VLC

Too bad for your AAC encoding, but, well.
(cherry picked from commit 34ba8bd409b16a33353b2240330b405c970b0f7c)

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

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

extras/contrib/src/Distributions/beos.mak  |    2 +-
extras/contrib/src/Distributions/darwin.mak |    2 +-
extras/contrib/src/Distributions/debian.mak |    2 +-
extras/contrib/src/Distributions/fedora.mak |    2 +-
extras/contrib/src/Distributions/unix.mak  |    2 +-
extras/contrib/src/Distributions/win32.mak  |    2 +-
extras/contrib/src/Makefile                |  21 +--------------------
extras/contrib/src/packages.mak            |    2 --
8 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/extras/contrib/src/Distributions/beos.mak b/extras/contrib/src/Distributions/beos.mak
index 53d9bcf..4eb9ff5 100644
--- a/extras/contrib/src/Distributions/beos.mak
+++ b/extras/contrib/src/Distributions/beos.mak
@@ -3,7 +3,7 @@ ifeq ($(HOST),$(BUILD))
# Native build: we need perl, autoconf, etc first
all: .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \
    .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-    .flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
+    .flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss \
    .dvdnav .dvbpsi .dca .aclocal
    #.speex seems
else
diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 5f3ee10..1758848 100644
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -1,7 +1,7 @@
# Darwin rules
all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
    .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-    .flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
+    .flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \
    .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
    .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
    .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
diff --git a/extras/contrib/src/Distributions/debian.mak b/extras/contrib/src/Distributions/debian.mak
index 7258fee..fa38915 100644
--- a/extras/contrib/src/Distributions/debian.mak
+++ b/extras/contrib/src/Distributions/debian.mak
@@ -1,7 +1,7 @@
# Debian Linux
all: .iconv .intl .freetype .fribidi .zlib \
    .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-    .flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
+    .flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss \
    .live .goom2k4 .caca .mod .x264  .xml .twolame \
    .png .gpg-error .gcrypt .gnutls .mpcdec \
    .dvdnav .dvbpsi .wxwidgets .dirac \
diff --git a/extras/contrib/src/Distributions/fedora.mak b/extras/contrib/src/Distributions/fedora.mak
index 69b8eb3..30325bd 100644
--- a/extras/contrib/src/Distributions/fedora.mak
+++ b/extras/contrib/src/Distributions/fedora.mak
@@ -1,7 +1,7 @@
# Fedora Linux rules
# Most dependencies are available from livna repro.
all: .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-    .flac .speex .faad .faac .lame .ebml .matroska .ffmpeg \
+    .flac .speex .faad .lame .ebml .matroska .ffmpeg \
    .live .goom2k4 .caca .mod .x264  .xml .twolame \
    .mpcdec \
    .dvbpsi .dirac .schroedinger \
diff --git a/extras/contrib/src/Distributions/unix.mak b/extras/contrib/src/Distributions/unix.mak
index 5eafb05..73f0cab 100644
--- a/extras/contrib/src/Distributions/unix.mak
+++ b/extras/contrib/src/Distributions/unix.mak
@@ -1,7 +1,7 @@
# Standard Linux or other UNIX-like systems
all: .iconv .intl .freetype .fribidi .zlib \
    .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-    .flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
+    .flac .speex .faad  .lame .ebml .matroska .ffmpeg .dvdcss \
    .live .goom2k4 .caca .mod .x264  .xml .twolame \
    .png .gpg-error .gcrypt .gnutls .mpcdec \
    .dvdnav .dvbpsi .wxwidgets .dirac \
diff --git a/extras/contrib/src/Distributions/win32.mak b/extras/contrib/src/Distributions/win32.mak
index 27ab5e5..5398a81 100644
--- a/extras/contrib/src/Distributions/win32.mak
+++ b/extras/contrib/src/Distributions/win32.mak
@@ -1,7 +1,7 @@
# WIN32 rules
all: .iconv .intl .freetype .fribidi .zlib \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \
-        .flac .speex .faad .faac .lame .ebml  .matroska .ffmpeg .dvdcss \
+        .flac .speex .faad .lame .ebml  .matroska .ffmpeg .dvdcss \
        .live .pthreads .goom2k4 .caca .mod .x264  .xml .twolame \
        .png .gpg-error .gcrypt .gnutls .mpcdec \
        .dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 68afa34..c8cdc10 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -149,7 +149,6 @@ ifdef HAVE_DARWIN_OS
X264CONF += --enable-pic
FFMPEGCONF += --cc=$(CC)
FFMPEGCONF += --arch=$(ARCH)
-FFMPEGCONF += --disable-libfaac
ifdef HAVE_DARWIN_10
FFMPEGCONF += --cpu=core2
X264CONF+=--host=x86_64-apple-darwin10
@@ -921,24 +920,6 @@ CLEAN_PKG += faad2
DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz

# ***************************************************************************
-# faac
-# ***************************************************************************
-
-faac-$(FAAC_VERSION).tar.gz:
-    $(WGET) $(FAAC_URL)
-
-faac: faac-$(FAAC_VERSION).tar.gz
-    $(EXTRACT_GZ)
-
-.faac: faac
-    (cd $<; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --without-mp4v2 --prefix=$(PREFIX) --disable-shared && make && make install)
-    touch $@
-
-CLEAN_FILE += .faac
-CLEAN_PKG += faac
-DISTCLEAN_PKG += faac-$(FAAC_VERSION).tar.gz
-
-# ***************************************************************************
# lame
# ***************************************************************************

@@ -1128,7 +1109,7 @@ else
ifdef HAVE_UCLIBC
.ffmpeg: ffmpeg
else
-.ffmpeg: ffmpeg .faac .lame .gsm
+.ffmpeg: ffmpeg .lame .gsm
endif
endif
    (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index e923e26..79e03ad 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -86,8 +86,6 @@ FAAD2_VERSION=2.7
FAAD2_URL=$(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
#FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
FAAD2_CVSROOT=:pserver:anonymous at cvs.audiocoding.com:/cvsroot/faac
-FAAC_VERSION=1.28
-FAAC_URL=$(SF)/faac/faac-$(FAAC_VERSION).tar.gz
LAME_VERSION=398-2
LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
LIBEBML_VERSION=0.7.8

_______________________________________________
vlc-devel mailing list
To unsubscribe or modify your subscription options:
http://mailman.videolan.org/listinfo/vlc-devel



      
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20090828/241be7a3/attachment.html>

More information about the vlc-devel mailing list