[FFmpeg-cvslog] r15705 - in trunk: configure libavcodec/Makefile
mru
subversion
Sat Oct 25 15:51:44 CEST 2008
Author: mru
Date: Sat Oct 25 15:51:43 2008
New Revision: 15705
Log:
Auto-enable CONFIG_MDCT when needed
Modified:
trunk/configure
trunk/libavcodec/Makefile
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sat Oct 25 15:51:43 2008
@@ -744,6 +744,7 @@ CONFIG_LIST="
libvorbis
libx264
libxvid
+ mdct
memalign_hack
mlib
mpegaudio_hp
@@ -919,30 +920,30 @@ fft_suggest="fft_mmx"
fft_mmx_deps="mmx yasm"
# decoders / encoders
-aac_decoder_select="fft"
+aac_decoder_select="fft mdct"
ac3_decoder_deps="gpl"
-ac3_decoder_select="fft"
-atrac3_decoder_select="fft"
-cook_decoder_select="fft"
-dca_decoder_select="fft"
+ac3_decoder_select="fft mdct"
+atrac3_decoder_select="fft mdct"
+cook_decoder_select="fft mdct"
+dca_decoder_select="fft mdct"
dxa_decoder_deps="zlib"
eac3_decoder_deps="gpl"
-eac3_decoder_select="fft"
+eac3_decoder_select="fft mdct"
flashsv_decoder_deps="zlib"
flashsv_encoder_deps="zlib"
-imc_decoder_select="fft"
+imc_decoder_select="fft mdct"
mpeg_xvmc_decoder_deps="xvmc"
-nellymoser_decoder_select="fft"
-nellymoser_encoder_select="fft"
+nellymoser_decoder_select="fft mdct"
+nellymoser_encoder_select="fft mdct"
png_decoder_deps="zlib"
png_encoder_deps="zlib"
-qdm2_decoder_select="fft"
-vorbis_decoder_select="fft"
-vorbis_encoder_select="fft"
-wmav1_decoder_select="fft"
-wmav1_encoder_select="fft"
-wmav2_decoder_select="fft"
-wmav2_encoder_select="fft"
+qdm2_decoder_select="fft mdct"
+vorbis_decoder_select="fft mdct"
+vorbis_encoder_select="fft mdct"
+wmav1_decoder_select="fft mdct"
+wmav1_encoder_select="fft mdct"
+wmav2_decoder_select="fft mdct"
+wmav2_encoder_select="fft mdct"
zmbv_decoder_deps="zlib"
zmbv_encoder_deps="zlib"
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile (original)
+++ trunk/libavcodec/Makefile Sat Oct 25 15:51:43 2008
@@ -25,10 +25,11 @@ HEADERS = avcodec.h opt.h
OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o
OBJS-$(CONFIG_FFT) += fft.o
+OBJS-$(CONFIG_MDCT) += mdct.o
-OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o mdct.o
+OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o
OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o
-OBJS-$(CONFIG_AC3_DECODER) += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o mdct.o
+OBJS-$(CONFIG_AC3_DECODER) += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o
OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o
OBJS-$(CONFIG_ALAC_DECODER) += alac.o
OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o lpc.o
@@ -38,7 +39,7 @@ OBJS-$(CONFIG_ASV1_DECODER) +
OBJS-$(CONFIG_ASV1_ENCODER) += asv1.o mpeg12data.o
OBJS-$(CONFIG_ASV2_DECODER) += asv1.o mpeg12data.o
OBJS-$(CONFIG_ASV2_ENCODER) += asv1.o mpeg12data.o
-OBJS-$(CONFIG_ATRAC3_DECODER) += atrac3.o mdct.o
+OBJS-$(CONFIG_ATRAC3_DECODER) += atrac3.o
OBJS-$(CONFIG_AVS_DECODER) += avs.o
OBJS-$(CONFIG_BETHSOFTVID_DECODER) += bethsoftvideo.o
OBJS-$(CONFIG_BFI_DECODER) += bfi.o
@@ -49,7 +50,7 @@ OBJS-$(CONFIG_CAVS_DECODER) +
OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o
OBJS-$(CONFIG_CLJR_DECODER) += cljr.o
OBJS-$(CONFIG_CLJR_ENCODER) += cljr.o
-OBJS-$(CONFIG_COOK_DECODER) += cook.o mdct.o
+OBJS-$(CONFIG_COOK_DECODER) += cook.o
OBJS-$(CONFIG_CSCD_DECODER) += cscd.o
OBJS-$(CONFIG_CYUV_DECODER) += cyuv.o
OBJS-$(CONFIG_DCA_DECODER) += dca.o
@@ -64,7 +65,7 @@ OBJS-$(CONFIG_DVDSUB_ENCODER) +
OBJS-$(CONFIG_DVVIDEO_DECODER) += dv.o
OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.o
OBJS-$(CONFIG_DXA_DECODER) += dxa.o
-OBJS-$(CONFIG_EAC3_DECODER) += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o mdct.o
+OBJS-$(CONFIG_EAC3_DECODER) += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o
OBJS-$(CONFIG_EACMV_DECODER) += eacmv.o
OBJS-$(CONFIG_EATGV_DECODER) += eatgv.o
OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o
@@ -97,7 +98,7 @@ OBJS-$(CONFIG_H264_ENCODER) +
OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o
OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o
-OBJS-$(CONFIG_IMC_DECODER) += imc.o mdct.o
+OBJS-$(CONFIG_IMC_DECODER) += imc.o
OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o
OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o
OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.o
@@ -140,8 +141,8 @@ OBJS-$(CONFIG_MSMPEG4V3_ENCODER) +
OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o msrledec.o
OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o
OBJS-$(CONFIG_MSZH_DECODER) += lcldec.o
-OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o nellymoser.o mdct.o
-OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o mdct.o
+OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o nellymoser.o
+OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o
OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o
OBJS-$(CONFIG_PAM_ENCODER) += pnmenc.o pnm.o
OBJS-$(CONFIG_PBM_ENCODER) += pnmenc.o pnm.o
@@ -152,7 +153,7 @@ OBJS-$(CONFIG_PNG_DECODER) +
OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o
OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o
OBJS-$(CONFIG_PTX_DECODER) += ptx.o
-OBJS-$(CONFIG_QDM2_DECODER) += qdm2.o mdct.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
+OBJS-$(CONFIG_QDM2_DECODER) += qdm2.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
OBJS-$(CONFIG_QDRAW_DECODER) += qdrw.o
OBJS-$(CONFIG_QPEG_DECODER) += qpeg.o
OBJS-$(CONFIG_QTRLE_DECODER) += qtrle.o
@@ -209,8 +210,8 @@ OBJS-$(CONFIG_VCR1_ENCODER) +
OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o
OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o
OBJS-$(CONFIG_VMNC_DECODER) += vmnc.o
-OBJS-$(CONFIG_VORBIS_DECODER) += vorbis_dec.o vorbis.o vorbis_data.o xiph.o mdct.o
-OBJS-$(CONFIG_VORBIS_ENCODER) += vorbis_enc.o vorbis.o vorbis_data.o mdct.o
+OBJS-$(CONFIG_VORBIS_DECODER) += vorbis_dec.o vorbis.o vorbis_data.o xiph.o
+OBJS-$(CONFIG_VORBIS_ENCODER) += vorbis_enc.o vorbis.o vorbis_data.o
OBJS-$(CONFIG_VP3_DECODER) += vp3.o vp3dsp.o
OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp3dsp.o
OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o vp3dsp.o huffman.o
@@ -218,10 +219,10 @@ OBJS-$(CONFIG_VP6A_DECODER) +
OBJS-$(CONFIG_VP6F_DECODER) += vp6.o vp56.o vp56data.o vp3dsp.o huffman.o
OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o
OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o
-OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o mdct.o
-OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o mdct.o
-OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o mdct.o
-OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o mdct.o
+OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o
+OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o
+OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o
+OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o
OBJS-$(CONFIG_WMV1_DECODER) += h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
OBJS-$(CONFIG_WMV1_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o msmpeg4.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o mpeg12data.o mpegvideo.o error_resilience.o
More information about the ffmpeg-cvslog
mailing list