From 6a26b4a66504f701baf35e58467e55aea28c0ad5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 18 Aug 2012 11:17:35 +0200 Subject: libmpcodecs: remove redundant audio and video decoders Probably all of these are supported by libavcodec. Missing things can be added back. Also remove qtpalette.h. It was used by demux_mov.c, and should have been deleted with commit 1fde09db6f4ce. --- configure | 101 -------------------------------------------------------------- 1 file changed, 101 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 72e9a48093..d209b74550 100755 --- a/configure +++ b/configure @@ -347,13 +347,9 @@ Codecs: --enable-jpeg enable JPEG input/output support [autodetect] --enable-libcdio enable libcdio support [autodetect] --enable-libav skip Libav autodetection [autodetect] - --enable-faad enable FAAD2 (AAC) [autodetect] --disable-ladspa disable LADSPA plugin support [autodetect] --disable-libbs2b disable libbs2b audio filter support [autodetect] --disable-mpg123 disable libmpg123 MP3 decoding support [autodetect] - --disable-mad disable libmad (MPEG audio) support [autodetect] - --enable-libdca enable libdca support [autodetect] - --disable-liba52 disable liba52 [autodetect] Video output: --enable-gl enable OpenGL video output [autodetect] @@ -461,11 +457,7 @@ _portaudio=auto _jack=auto _openal=no _libcdio=auto -_mad=auto _mpg123=auto -_liba52=auto -_libdca=auto -_faad=auto _ladspa=auto _libbs2b=auto _vcd=auto @@ -664,18 +656,10 @@ for ac_option do --disable-jack) _jack=no ;; --enable-openal) _openal=yes ;; --disable-openal) _openal=no ;; - --enable-mad) _mad=yes ;; - --disable-mad) _mad=no ;; --enable-libcdio) _libcdio=yes ;; --disable-libcdio) _libcdio=no ;; --enable-mpg123) _mpg123=yes ;; --disable-mpg123) _mpg123=no ;; - --enable-liba52) _liba52=yes ;; - --disable-liba52) _liba52=no ;; - --enable-libdca) _libdca=yes ;; - --disable-libdca) _libdca=no ;; - --enable-faad) _faad=yes ;; - --disable-faad) _faad=no ;; --enable-ladspa) _ladspa=yes ;; --disable-ladspa) _ladspa=no ;; --enable-libbs2b) _libbs2b=yes ;; @@ -2856,22 +2840,6 @@ fi echores "$_zlib" -echocheck "mad support" -if test "$_mad" = auto ; then - _mad=no - statement_check mad.h 'mad_synth_init(0)' -lmad && _mad=yes -fi -if test "$_mad" = yes ; then - def_mad='#define CONFIG_LIBMAD 1' - extra_ldflags="$extra_ldflags -lmad" - codecmodules="libmad $codecmodules" -else - def_mad='#undef CONFIG_LIBMAD' - nocodecmodules="libmad $nocodecmodules" -fi -echores "$_mad" - - # Any version of libmpg123 that knows MPG123_RESYNC_LIMIT shall be fine. # That is, 1.2.0 onwards. Recommened is 1.14 onwards, though. echocheck "mpg123 support" @@ -2888,67 +2856,6 @@ else fi echores "$_mpg123" -echocheck "liba52 support" -def_liba52='#undef CONFIG_LIBA52' -if test "$_liba52" = auto ; then - _liba52=no - cat > $TMPC << EOF -#include -#include -int main(void) { a52_state_t *testHand; testHand=a52_init(0); return 0; } -EOF - cc_check -la52 && _liba52=yes && extra_ldflags="$extra_ldflags -la52" -fi -if test "$_liba52" = yes ; then - def_liba52='#define CONFIG_LIBA52 1' - codecmodules="liba52 $codecmodules" -else - nocodecmodules="liba52 $nocodecmodules" -fi -echores "$_liba52" - -echocheck "libdca support" -if test "$_libdca" = auto ; then - _libdca=no - for _ld_dca in -ldca -ldts ; do - statement_check_broken stdint.h dts.h 'dts_init(0)' $_ld_dca $_ld_lm && - extra_ldflags="$extra_ldflags $_ld_dca" && _libdca=yes && break - done -fi -if test "$_libdca" = yes ; then - def_libdca='#define CONFIG_LIBDCA 1' - codecmodules="libdca $codecmodules" -else - def_libdca='#undef CONFIG_LIBDCA' - nocodecmodules="libdca $nocodecmodules" -fi -echores "$_libdca" - - -echocheck "FAAD2 support" -if test "$_faad" = auto ; then - _faad=no - cat > $TMPC << EOF -#include -#ifndef FAAD_MIN_STREAMSIZE -#error Too old version -#endif -int main(void) { faacDecHandle testhand; faacDecFrameInfo testinfo; - testhand = faacDecOpen(); faacDecInit(0, 0, 0, 0, 0); return 0; } -EOF - cc_check -lfaad $_ld_lm && _faad=yes -fi - -def_faad='#undef CONFIG_FAAD' -if test "$_faad" = yes ; then - def_faad='#define CONFIG_FAAD 1' - extra_ldflags="$extra_ldflags -lfaad" - codecmodules="faad2 $codecmodules" -else - nocodecmodules="faad2 $nocodecmodules" -fi -echores "$_faad" - echocheck "LADSPA plugin support" if test "$_ladspa" = auto ; then @@ -3426,7 +3333,6 @@ DIRECT3D = $_direct3d DVBIN = $_dvbin DVDREAD = $_dvdread DXR3 = $_dxr3 -FAAD = $_faad FTP = $_ftp GIF = $_gif GL = $_gl @@ -3439,14 +3345,11 @@ JACK = $_jack JOYSTICK = $_joystick JPEG = $_jpeg LADSPA = $_ladspa -LIBA52 = $_liba52 LIBASS = $_ass LIBASS_OSD = $_libass_osd DUMMY_OSD = $_dummy_osd LIBBLURAY = $_bluray LIBBS2B = $_libbs2b -LIBDCA = $_libdca -LIBMAD = $_mad LCMS2 = $_lcms2 LIBPOSTPROC = $libpostproc LIBSMBCLIENT = $_smb @@ -3616,10 +3519,6 @@ $def_vcd /* codec libraries */ -$def_faad -$def_liba52 -$def_libdca -$def_mad $def_mpg123 $def_zlib -- cgit v1.2.3