b25a265a5c
* qatar/master: pcm-mpeg: convert to bytestream2 API Revert "h264: clear trailing bits in partially parsed NAL units" remove iwmmxt optimizations mimic: do not continue if swap_buf_size is 0 mimic: convert to bytestream2 API frwu: use MKTAG to check marker instead of AV_RL32 txd: port to bytestream2 API c93: convert to bytestream2 API iff: make .long_name more descriptive FATE: add test for cdxl demuxer rtsp: Fix a typo Conflicts: libavcodec/arm/dsputil_iwmmxt.c libavcodec/arm/dsputil_iwmmxt_rnd_template.c libavcodec/arm/mpegvideo_iwmmxt.c libavcodec/c93.c libavcodec/txd.c libavutil/arm/cpu.c tests/fate/demux.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
94 lines
4.7 KiB
Makefile
94 lines
4.7 KiB
Makefile
OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_init_arm.o \
|
|
arm/ac3dsp_arm.o
|
|
|
|
OBJS-$(CONFIG_AAC_DECODER) += arm/sbrdsp_init_arm.o
|
|
|
|
OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o \
|
|
|
|
ARMV6-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_armv6.o
|
|
|
|
OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_init_arm.o
|
|
ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_fixed_armv6.o
|
|
|
|
OBJS-$(CONFIG_VP5_DECODER) += arm/vp56dsp_init_arm.o
|
|
OBJS-$(CONFIG_VP6_DECODER) += arm/vp56dsp_init_arm.o
|
|
OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_init_arm.o
|
|
ARMV6-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8_armv6.o \
|
|
arm/vp8dsp_armv6.o
|
|
|
|
OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o
|
|
OBJS-$(CONFIG_H264PRED) += arm/h264pred_init_arm.o
|
|
|
|
OBJS += arm/dsputil_init_arm.o \
|
|
arm/dsputil_arm.o \
|
|
arm/fft_init_arm.o \
|
|
arm/fft_fixed_init_arm.o \
|
|
arm/fmtconvert_init_arm.o \
|
|
arm/jrevdct_arm.o \
|
|
arm/mpegvideo_arm.o \
|
|
arm/simple_idct_arm.o \
|
|
|
|
OBJS-$(HAVE_ARMV5TE) += arm/dsputil_init_armv5te.o \
|
|
arm/mpegvideo_armv5te.o \
|
|
arm/mpegvideo_armv5te_s.o \
|
|
arm/simple_idct_armv5te.o \
|
|
|
|
OBJS-$(HAVE_ARMV6) += arm/dsputil_init_armv6.o \
|
|
arm/dsputil_armv6.o \
|
|
arm/simple_idct_armv6.o \
|
|
$(ARMV6-OBJS-yes)
|
|
|
|
VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o \
|
|
|
|
OBJS-$(HAVE_ARMVFP) += arm/dsputil_vfp.o \
|
|
arm/dsputil_init_vfp.o \
|
|
$(VFP-OBJS-yes)
|
|
|
|
NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \
|
|
arm/fft_fixed_neon.o \
|
|
|
|
NEON-OBJS-$(CONFIG_MDCT) += arm/mdct_neon.o \
|
|
arm/mdct_fixed_neon.o \
|
|
|
|
NEON-OBJS-$(CONFIG_RDFT) += arm/rdft_neon.o \
|
|
|
|
NEON-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_neon.o \
|
|
arm/h264idct_neon.o \
|
|
arm/h264cmc_neon.o \
|
|
|
|
NEON-OBJS-$(CONFIG_H264PRED) += arm/h264pred_neon.o \
|
|
|
|
NEON-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_neon.o
|
|
|
|
NEON-OBJS-$(CONFIG_AAC_DECODER) += 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_init_neon.o \
|
|
arm/rv34dsp_neon.o \
|
|
|
|
NEON-OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_init_neon.o \
|
|
arm/rv34dsp_neon.o \
|
|
arm/rv40dsp_init_neon.o \
|
|
arm/rv40dsp_neon.o \
|
|
arm/h264cmc_neon.o \
|
|
|
|
NEON-OBJS-$(CONFIG_VP3_DECODER) += arm/vp3dsp_neon.o
|
|
|
|
NEON-OBJS-$(CONFIG_VP5_DECODER) += arm/vp56dsp_neon.o \
|
|
arm/vp3dsp_neon.o \
|
|
|
|
NEON-OBJS-$(CONFIG_VP6_DECODER) += arm/vp56dsp_neon.o \
|
|
arm/vp3dsp_neon.o \
|
|
|
|
NEON-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_neon.o
|
|
|
|
OBJS-$(HAVE_NEON) += arm/dsputil_init_neon.o \
|
|
arm/dsputil_neon.o \
|
|
arm/fmtconvert_neon.o \
|
|
arm/int_neon.o \
|
|
arm/mpegvideo_neon.o \
|
|
arm/simple_idct_neon.o \
|
|
$(NEON-OBJS-yes)
|