remove libfaad from build

We don't use it anymore.  We have been using ffaac decoder for a while now.

git-svn-id: svn://localhost/HandBrake/trunk@3793 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 720f194..b07dc91 100644 (file)
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -4,13 +4,13 @@ if MINGW
 HB_LIBS= \
        -lhb -la52 -lmkv -lavformat -lavcodec -lavcore -lavutil -ldca -ldvdnav -ldvdread \
        -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-       -lx264 -lmp4v2 -lswscale -ltheora -lfaad -lz \
+       -lx264 -lmp4v2 -lswscale -ltheora -lz \
        -lbz2 -liberty -lpthreadGC2 -lbluray -lass -lfontconfig -lfreetype
 else
 HB_LIBS= \
        -lhb -la52 -lmkv -lavformat -lavcodec -lavcore -lavutil -ldca -ldvdnav -ldvdread \
        -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
-       -lx264 -lmp4v2 -lswscale -ltheora -lfaad -lz \
+       -lx264 -lmp4v2 -lswscale -ltheora -lz \
        -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype
 endif
 

diff --git a/libhb/module.defs b/libhb/module.defs
index 6518bcc..cf5dda9 100644 (file)
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -92,7 +92,7 @@ LIBHB.dll = $(LIBHB.build/)hb.dll
 LIBHB.lib = $(LIBHB.build/)hb.lib
 
 LIBHB.dll.libs = $(foreach n, \
-        a52 ass avcore avcodec avformat avutil dca dvdnav dvdread faac faad fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
+        a52 ass avcore avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
         ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
         $(CONTRIB.build/)lib/lib$(n).a )
 

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index cba643a..56e541c 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -747,7 +747,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -784,7 +783,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -856,7 +854,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -899,7 +896,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -992,7 +988,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1035,7 +1030,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1128,7 +1122,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1171,7 +1164,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1264,7 +1256,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1307,7 +1298,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1403,7 +1393,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1446,7 +1435,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1542,7 +1530,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1585,7 +1572,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1681,7 +1667,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1724,7 +1709,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1820,7 +1804,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1863,7 +1846,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -1967,7 +1949,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
@@ -2014,7 +1995,6 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
-                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
                                        "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",

diff --git a/make/include/main.defs b/make/include/main.defs
index 4742f0f..8528d3b 100644 (file)
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -17,7 +17,6 @@ endif
 endif
 
 MODULES += contrib/faac
-MODULES += contrib/faad2
 MODULES += contrib/ffmpeg
 MODULES += contrib/fontconfig
 MODULES += contrib/freetype

diff --git a/test/module.defs b/test/module.defs
index 33d34d4..35a4d8b 100644 (file)
--- a/test/module.defs
+++ b/test/module.defs
@@ -10,7 +10,7 @@ TEST.c.o = $(patsubst $(SRC/)%.c,$(BUILD/)%.o,$(TEST.c))
 TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
 
 TEST.libs = $(LIBHB.a) $(foreach n, \
-        a52 ass avcore avcodec avformat avutil dca dvdnav dvdread faac faad fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
+        a52 ass avcore avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
         ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
         $(CONTRIB.build/)lib/lib$(n).a )