mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-10-05 12:33:25 +00:00
bec180e112
* commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93': (21 commits) cmdutils: fix a memleak when specifying an option twice. x86: mpegvideo: more sensible names for optimization file and init function x86: mpegvideoenc: Split optimizations off into a separate file dnxhdenc: x86: more sensible names for optimization file and init function svq1/svq3: Move common code out of SVQ1 decoder-specific file dirac: add Comments and references to the standard lavr: x86: optimized 6-channel flt to fltp conversion lavr: x86: optimized 2-channel flt to fltp conversion lavr: x86: optimized 6-channel flt to s16p conversion lavr: x86: optimized 2-channel flt to s16p conversion lavr: x86: optimized 6-channel s16 to fltp conversion lavr: x86: optimized 2-channel s16 to fltp conversion lavr: x86: optimized 6-channel s16 to s16p conversion lavr: x86: optimized 2-channel s16 to s16p conversion lavr: x86: optimized 2-channel fltp to flt conversion lavr: x86: optimized 6-channel fltp to s16 conversion lavr: x86: optimized 2-channel fltp to s16 conversion lavr: x86: optimized 6-channel s16p to flt conversion lavr: x86: optimized 2-channel s16p to flt conversion lavr: x86: optimized 6-channel s16p to s16 conversion ... Conflicts: libavcodec/dirac.c libavcodec/mpegvideo.h libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
77 lines
4.4 KiB
Makefile
77 lines
4.4 KiB
Makefile
OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
|
|
OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
|
|
OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp_init.o
|
|
OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
|
|
|
|
MMX-OBJS += x86/dsputil_mmx.o \
|
|
x86/fdct_mmx.o \
|
|
x86/fmtconvert_init.o \
|
|
x86/idct_mmx_xvid.o \
|
|
x86/idct_sse2_xvid.o \
|
|
x86/motion_est_mmx.o \
|
|
x86/simple_idct_mmx.o \
|
|
|
|
MMX-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o
|
|
MMX-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o
|
|
MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o
|
|
MMX-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o
|
|
MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp_mmx.o \
|
|
x86/dwt.o
|
|
MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o
|
|
MMX-OBJS-$(CONFIG_FFT) += x86/fft_init.o
|
|
MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o
|
|
MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o
|
|
MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o
|
|
MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o
|
|
MMX-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec_mmx.o
|
|
MMX-OBJS-$(CONFIG_MPEGVIDEO) += x86/mpegvideo.o
|
|
MMX-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoenc.o
|
|
MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o
|
|
MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o
|
|
MMX-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp_init.o
|
|
MMX-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o
|
|
MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \
|
|
x86/rv40dsp_init.o
|
|
MMX-OBJS-$(CONFIG_V210_DECODER) += x86/v210-init.o
|
|
MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
|
|
MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o
|
|
MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o
|
|
MMX-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o
|
|
|
|
YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o
|
|
YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o
|
|
YASM-OBJS-$(CONFIG_DCT) += x86/dct32_sse.o
|
|
YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o
|
|
YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o
|
|
YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o \
|
|
$(YASM-OBJS-FFT-yes)
|
|
|
|
YASM-OBJS-$(CONFIG_DWT) += x86/dwt_yasm.o
|
|
YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \
|
|
x86/h264_chromamc_10bit.o
|
|
YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock.o \
|
|
x86/h264_deblock_10bit.o \
|
|
x86/h264_idct.o \
|
|
x86/h264_idct_10bit.o \
|
|
x86/h264_weight.o \
|
|
x86/h264_weight_10bit.o
|
|
YASM-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred.o \
|
|
x86/h264_intrapred_10bit.o
|
|
YASM-OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel_10bit.o
|
|
YASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36_sse.o
|
|
YASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o
|
|
YASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o
|
|
YASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o
|
|
YASM-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp.o
|
|
YASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp.o \
|
|
x86/rv40dsp.o
|
|
YASM-OBJS-$(CONFIG_V210_DECODER) += x86/v210.o
|
|
YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp.o
|
|
YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o
|
|
YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp.o
|
|
YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o
|
|
|
|
YASM-OBJS += x86/dsputil.o \
|
|
x86/deinterlace.o \
|
|
x86/fmtconvert.o \
|