mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
fb61ed1e9f
* commit 'ac4b32df71bd932838043a4838b86d11e169707f':
On2 VP7 decoder
Conflicts:
Changelog
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/vp8dsp.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/arm/vp8dsp_init_armv6.c
libavcodec/arm/vp8dsp_init_neon.c
libavcodec/avcodec.h
libavcodec/h264pred.c
libavcodec/version.h
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
libavcodec/vp8dsp.h
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/vp8dsp_init.c
See: 89f2f5dbd7 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
114 lines
6.5 KiB
Makefile
114 lines
6.5 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_DSPUTIL) += arm/dsputil_init_arm.o \
|
|
arm/dsputil_arm.o \
|
|
arm/jrevdct_arm.o \
|
|
arm/simple_idct_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_MPEGAUDIODSP) += arm/mpegaudiodsp_init_arm.o
|
|
OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_arm.o
|
|
OBJS-$(CONFIG_NEON_CLOBBER_TEST) += arm/neontest.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_DSPUTIL) += arm/dsputil_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_DSPUTIL) += arm/dsputil_init_armv6.o \
|
|
arm/dsputil_armv6.o \
|
|
arm/simple_idct_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_armv6.o \
|
|
arm/hpeldsp_armv6.o
|
|
ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_fixed_armv6.o
|
|
|
|
ARMV6-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_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_DSPUTIL) += arm/dsputil_init_neon.o \
|
|
arm/dsputil_neon.o \
|
|
arm/int_neon.o \
|
|
arm/simple_idct_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_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_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
|