diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 66 |
1 files changed, 6 insertions, 60 deletions
@@ -344,9 +344,7 @@ Codecs: --disable-libvorbis disable libvorbis support [autodetect] --disable-speex disable Speex support [autodetect] --enable-theora enable OggTheora libraries [autodetect] - --enable-faad enable external FAAD2 (AAC) [autodetect] - --disable-faad-internal disable internal FAAD2 (AAC) [autodetect] - --enable-faad-fixed enable fixed-point mode in internal FAAD2 [disabled] + --enable-faad enable FAAD2 (AAC) [autodetect] --disable-ladspa disable LADSPA plugin support [autodetect] --disable-libbs2b disable libbs2b audio filter support [autodetect] --disable-libdv disable libdv 0.9.5 en/decoding support [autodetect] @@ -607,8 +605,6 @@ _liba52=auto _libdca=auto _libmpeg2=auto _faad=auto -_faad_internal=auto -_faad_fixed=no _ladspa=auto _libbs2b=auto _xmms=no @@ -986,10 +982,6 @@ for ac_option do --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-ladspa) _ladspa=yes ;; --disable-ladspa) _ladspa=no ;; --enable-libbs2b) _libbs2b=yes ;; @@ -6125,27 +6117,8 @@ echores "$_musepack" 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 @@ -6158,29 +6131,11 @@ EOF 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 + extra_ldflags="$extra_ldflags -lfaad" + codecmodules="faad2 $codecmodules" else - _faad=no nocodecmodules="faad2 $nocodecmodules" fi echores "$_faad" @@ -7126,7 +7081,6 @@ CXXFLAGS = $WARNFLAGS $CXXFLAGS $extra_cflags $extra_cxxflags 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 @@ -7191,7 +7145,6 @@ DXR2 = $_dxr2 DXR3 = $_dxr3 ESD = $_esd FAAD = $_faad -FAAD_INTERNAL = $_faad_internal FASTMEMCPY = $_fastmemcpy FBDEV = $_fbdev FREETYPE = $_freetype @@ -7399,17 +7352,11 @@ $def_fast_inttypes #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 */ @@ -7525,7 +7472,6 @@ $def_vcd /* codec libraries */ $def_faad -$def_faad_internal $def_liba52 $def_libdca $def_libdv |