diff configure @ 32654:85f0d7406e07

Remove forked internal libfaad2 copy. The FFmpeg AAC decoder is default now and surpasses libfaad2 in all regards, so there is no longer a reason to keep a forked library copy.

--- a/configure	Sat Jan 01 14:06:21 2011 +0000
+++ b/configure	Sat Jan 01 14:27:41 2011 +0000
@@ -358,9 +358,7 @@
   --disable-speex           disable Speex support [autodetect]
   --disable-libgsm          disable libgsm support [autodetect]
   --enable-theora           enable OggTheora libraries [autodetect]
-  --enable-faad             enable external FAAD2 (AAC) [autodetect]
-  --enable-faad-internal    enable internal FAAD2 (AAC) [disabled]
-  --enable-faad-fixed       enable fixed-point mode in internal FAAD2 [disabled]
+  --enable-faad             enable FAAD2 (AAC) [autodetect]
   --disable-faac            disable support for FAAC (AAC encoder) [autodetect]
   --disable-faac-lavc       disable support for FAAC in libavcodec [autodetect]
   --disable-ladspa          disable LADSPA plugin support [autodetect]
@@ -669,8 +667,6 @@
 _libmpeg2=auto
 _libmpeg2_internal=auto
 _faad=auto
-_faad_internal=no
-_faad_fixed=no
 _faac=auto
 _faac_lavc=auto
 _ladspa=auto
@@ -1076,10 +1072,6 @@
   --disable-musepack)   _musepack=no    ;;
   --enable-faad)        _faad=yes       ;;
   --disable-faad)       _faad=no        ;;
-  --enable-faad-internal)       _faad_internal=yes      ;;
-  --disable-faad-internal)      _faad_internal=no       ;;
-  --enable-faad-fixed)  _faad_fixed=yes ;;
-  --disable-faad-fixed) _faad_fixed=no  ;;
   --enable-faac)        _faac=yes       ;;
   --disable-faac)       _faac=no        ;;
   --enable-faac-lavc)   _faac_lavc=yes  ;;
@@ -6630,27 +6622,8 @@
 
 
 echocheck "FAAD2 support"
-if test "$_faad_internal" = auto ; then
-  if cygwin ; then
-    _faad_internal=no
-    res_comment="does not compile on cygwin"
-  elif x86_32 && test cc_vendor=gnu; then
-    case $cc_version in
-      3.1*|3.2) # ICE/insn with these versions
-        _faad_internal=no
-        res_comment="broken gcc"
-        ;;
-      *)
-        _faad=yes
-        _faad_internal=yes
-        ;;
-    esac
-  else
-    _faad=yes
-    _faad_internal=yes
-  fi
-fi
 if test "$_faad" = auto ; then
+  _faad=no
   cat > $TMPC << EOF
 #include <faad.h>
 #ifndef FAAD_MIN_STREAMSIZE
@@ -6663,29 +6636,11 @@
 fi
 
 def_faad='#undef CONFIG_FAAD'
-def_faad_internal="#undef CONFIG_FAAD_INTERNAL"
-if test "$_faad_internal" = yes ; then
-  def_faad_internal="#define CONFIG_FAAD_INTERNAL 1"
-  res_comment="internal floating-point"
-  if test "$_faad_fixed" = yes ; then
-    # The FIXED_POINT implementation of FAAD2 improves performance
-    # on some platforms, especially for SBR files.
-    cflags_faad_fixed="-DFIXED_POINT"
-    res_comment="internal fixed-point"
-  fi
-elif test "$_faad" = yes ; then
-  extra_ldflags="$extra_ldflags -lfaad"
-fi
-
 if test "$_faad" = yes ; then
   def_faad='#define CONFIG_FAAD 1'
-  if test "$_faad_internal" = yes ; then
-    codecmodules="faad2(internal) $codecmodules"
-  else
-    codecmodules="faad2 $codecmodules"
-  fi
-else
-  _faad=no
+  extra_ldflags="$extra_ldflags -lfaad"
+  codecmodules="faad2 $codecmodules"
+else
   nocodecmodules="faad2 $nocodecmodules"
 fi
 echores "$_faad"
@@ -8026,7 +7981,6 @@
 CC_DEPFLAGS = $DEPFLAGS
 
 CFLAGS_DHAHELPER         = $cflags_dhahelper
-CFLAGS_FAAD_FIXED        = $cflags_faad_fixed
 CFLAGS_LIBDVDCSS         = $cflags_libdvdcss
 CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread
 CFLAGS_LIBDVDNAV         = $cflags_libdvdnav
@@ -8095,7 +8049,6 @@
 ESD = $_esd
 FAAC=$_faac
 FAAD = $_faad
-FAAD_INTERNAL = $_faad_internal
 FASTMEMCPY = $_fastmemcpy
 FBDEV = $_fbdev
 FREETYPE = $_freetype
@@ -8360,17 +8313,11 @@
 #define HAVE_ERRNO_H 1
 /* libdvdcss + libdvdread */
 #define HAVE_LIMITS_H 1
-/* libdvdcss + libfaad2 */
+/* libdvdcss */
 #define HAVE_UNISTD_H 1
-/* libfaad2 + libdvdread */
+/* libdvdread */
 #define STDC_HEADERS 1
 #define HAVE_MEMCPY 1
-/* libfaad2 */
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
 /* libdvdnav */
 #define READ_CACHE_TRACE 0
 /* libdvdread */
@@ -8487,7 +8434,6 @@
 /* codec libraries */
 $def_faac
 $def_faad
-$def_faad_internal
 $def_liba52
 $def_libdca
 $def_libdv