Faac is NOT compatible with VLC

Too bad for your AAC encoding, but, well.

diff --git a/extras/contrib/src/Distributions/beos.mak b/extras/contrib/src/Distributions/beos.mak
index 53d9bcffbc7c6b59894ed93cadcf083353585082..4eb9ff59fc59b26c1c1163b8be021bb9f77b4529 100644 (file)
--- 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 5f3ee10f3ff28db757f6bf8375249b0896f7cdba..1758848998483ec3f727e3596fd656f121f8c845 100644 (file)
--- 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 5b433ae4168be8da1e16f9381a63c29d57d6c8c5..0b1eed85c8fd95e403956e2e649c71837366ba90 100644 (file)
--- 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 .dirac \

diff --git a/extras/contrib/src/Distributions/fedora.mak b/extras/contrib/src/Distributions/fedora.mak
index 69b8eb36ef52e4b3a34016fa62c583892ead45c0..30325bd91bfa1a6d1701f6dc32bbc2ada67269bd 100644 (file)
--- 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 682e15db89b68f4bc6bfb8457a9a5e7b467ce2f4..942aea11e0fc9b29a918a62a49ed148d9169e3f2 100644 (file)
--- 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 .dirac \

diff --git a/extras/contrib/src/Distributions/win32.mak b/extras/contrib/src/Distributions/win32.mak
index 3e18b805c24e899215c2a36c2d773f0c77c01da9..c23ae644e7bdaf4e10a38f1bf2330a5bd0000110 100644 (file)
--- 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 aee5088afad55ec8e3e2620f27988bb642654bea..91b752601e5c8e6ecb57296298ed40a87ef750e5 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -148,7 +148,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_FILE += .faad
 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
 # ***************************************************************************
@@ -1129,7 +1110,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 5d1fa1a2fed5c2aa7c359199d50a1589785aa445..fea2654c025b88e1d347824b4ff9a07b617da65b 100644 (file)
--- 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@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