3a2d1465c8
* commit '2d60444331fca1910510038dd3817bea885c2367': dsputil: Split motion estimation compare bits off into their own context Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile libavcodec/dvenc.c libavcodec/error_resilience.c libavcodec/h264.h libavcodec/h264_slice.c libavcodec/me_cmp.c libavcodec/me_cmp.h libavcodec/motion_est.c libavcodec/motion_est_template.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
130 lines
7.6 KiB
Makefile
130 lines
7.6 KiB
Makefile
ARCH_HEADERS = mathops.h
|
|
|
|
OBJS += arm/fmtconvert_init_arm.o
|
|
|
|
OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_init_arm.o \
|
|
arm/ac3dsp_arm.o
|
|
OBJS-$(CONFIG_AUDIODSP) += arm/audiodsp_init_arm.o
|
|
OBJS-$(CONFIG_BLOCKDSP) += arm/blockdsp_init_arm.o
|
|
OBJS-$(CONFIG_FFT) += arm/fft_init_arm.o \
|
|
arm/fft_fixed_init_arm.o
|
|
OBJS-$(CONFIG_H264CHROMA) += arm/h264chroma_init_arm.o
|
|
OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o
|
|
OBJS-$(CONFIG_H264PRED) += arm/h264pred_init_arm.o
|
|
OBJS-$(CONFIG_H264QPEL) += arm/h264qpel_init_arm.o
|
|
OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_arm.o \
|
|
arm/hpeldsp_arm.o
|
|
OBJS-$(CONFIG_IDCTDSP) += arm/idctdsp_init_arm.o \
|
|
arm/idctdsp_arm.o \
|
|
arm/jrevdct_arm.o \
|
|
arm/simple_idct_arm.o
|
|
OBJS-$(CONFIG_LLAUDDSP) += arm/lossless_audiodsp_init_arm.o
|
|
OBJS-$(CONFIG_ME_CMP) += arm/me_cmp_init_arm.o
|
|
OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_init_arm.o
|
|
OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_arm.o
|
|
OBJS-$(CONFIG_MPEGVIDEOENC) += arm/mpegvideoencdsp_init_arm.o
|
|
OBJS-$(CONFIG_NEON_CLOBBER_TEST) += arm/neontest.o
|
|
OBJS-$(CONFIG_PIXBLOCKDSP) += arm/pixblockdsp_init_arm.o
|
|
OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_arm.o
|
|
OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_init_arm.o
|
|
|
|
OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_init_arm.o \
|
|
arm/sbrdsp_init_arm.o
|
|
OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o
|
|
OBJS-$(CONFIG_FLAC_DECODER) += arm/flacdsp_init_arm.o \
|
|
arm/flacdsp_arm.o
|
|
OBJS-$(CONFIG_FLAC_ENCODER) += arm/flacdsp_init_arm.o
|
|
OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_init_arm.o
|
|
OBJS-$(CONFIG_VC1_DECODER) += arm/vc1dsp_init_arm.o
|
|
OBJS-$(CONFIG_VORBIS_DECODER) += arm/vorbisdsp_init_arm.o
|
|
OBJS-$(CONFIG_VP6_DECODER) += arm/vp6dsp_init_arm.o
|
|
OBJS-$(CONFIG_VP7_DECODER) += arm/vp8dsp_init_arm.o
|
|
OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_init_arm.o
|
|
OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_init_arm.o
|
|
OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_init_arm.o \
|
|
arm/rv40dsp_init_arm.o
|
|
|
|
ARMV5TE-OBJS-$(CONFIG_IDCTDSP) += arm/idctdsp_init_armv5te.o \
|
|
arm/simple_idct_armv5te.o
|
|
ARMV5TE-OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_armv5te.o \
|
|
arm/mpegvideo_armv5te_s.o
|
|
ARMV5TE-OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_armv5te.o \
|
|
arm/videodsp_armv5te.o
|
|
|
|
ARMV5TE-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv5te.o
|
|
|
|
ARMV6-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_H264DSP) += arm/startcode_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_armv6.o \
|
|
arm/hpeldsp_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_IDCTDSP) += arm/idctdsp_init_armv6.o \
|
|
arm/idctdsp_armv6.o \
|
|
arm/simple_idct_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_ME_CMP) += arm/me_cmp_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_fixed_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_MPEGVIDEOENC) += arm/mpegvideoencdsp_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_PIXBLOCKDSP) += arm/pixblockdsp_armv6.o
|
|
|
|
ARMV6-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_VC1_DECODER) += arm/startcode_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_VC1_PARSER) += arm/startcode_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_VP7_DECODER) += arm/vp8_armv6.o \
|
|
arm/vp8dsp_init_armv6.o \
|
|
arm/vp8dsp_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8_armv6.o \
|
|
arm/vp8dsp_init_armv6.o \
|
|
arm/vp8dsp_armv6.o
|
|
|
|
VFP-OBJS += arm/fmtconvert_vfp.o
|
|
|
|
VFP-OBJS-$(CONFIG_FFT) += arm/fft_vfp.o
|
|
VFP-OBJS-$(CONFIG_MDCT) += arm/mdct_vfp.o
|
|
VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp_armv6.o
|
|
|
|
VFP-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_vfp.o \
|
|
arm/synth_filter_vfp.o
|
|
|
|
NEON-OBJS += arm/fmtconvert_neon.o
|
|
|
|
NEON-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_neon.o
|
|
NEON-OBJS-$(CONFIG_AUDIODSP) += arm/audiodsp_init_neon.o \
|
|
arm/audiodsp_neon.o \
|
|
arm/int_neon.o
|
|
NEON-OBJS-$(CONFIG_BLOCKDSP) += arm/blockdsp_init_neon.o \
|
|
arm/blockdsp_neon.o
|
|
NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \
|
|
arm/fft_fixed_neon.o
|
|
NEON-OBJS-$(CONFIG_H264CHROMA) += arm/h264cmc_neon.o
|
|
NEON-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_neon.o \
|
|
arm/h264idct_neon.o
|
|
NEON-OBJS-$(CONFIG_H264PRED) += arm/h264pred_neon.o
|
|
NEON-OBJS-$(CONFIG_H264QPEL) += arm/h264qpel_neon.o \
|
|
arm/hpeldsp_neon.o
|
|
NEON-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_neon.o \
|
|
arm/hpeldsp_neon.o
|
|
NEON-OBJS-$(CONFIG_IDCTDSP) += arm/idctdsp_init_neon.o \
|
|
arm/idctdsp_neon.o \
|
|
arm/simple_idct_neon.o
|
|
NEON-OBJS-$(CONFIG_MDCT) += arm/mdct_neon.o \
|
|
arm/mdct_fixed_neon.o
|
|
NEON-OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_neon.o
|
|
NEON-OBJS-$(CONFIG_RDFT) += arm/rdft_neon.o
|
|
NEON-OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_neon.o
|
|
|
|
NEON-OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_neon.o \
|
|
arm/sbrdsp_neon.o
|
|
NEON-OBJS-$(CONFIG_LLAUDDSP) += arm/lossless_audiodsp_neon.o
|
|
NEON-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_neon.o \
|
|
arm/synth_filter_neon.o
|
|
NEON-OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_neon.o
|
|
NEON-OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_neon.o \
|
|
arm/rv40dsp_neon.o
|
|
NEON-OBJS-$(CONFIG_VC1_DECODER) += arm/vc1dsp_init_neon.o \
|
|
arm/vc1dsp_neon.o
|
|
NEON-OBJS-$(CONFIG_VORBIS_DECODER) += arm/vorbisdsp_neon.o
|
|
NEON-OBJS-$(CONFIG_VP6_DECODER) += arm/vp6dsp_neon.o
|
|
NEON-OBJS-$(CONFIG_VP7_DECODER) += arm/vp8dsp_init_neon.o \
|
|
arm/vp8dsp_neon.o
|
|
NEON-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_init_neon.o \
|
|
arm/vp8dsp_neon.o
|