mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit '54a6e08a650a71fd375551585b0ea40a3a06d228'
* commit '54a6e08a650a71fd375551585b0ea40a3a06d228': dsputil: Conditionally compile dsputil code on all architectures Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3775224b2f
@ -1,10 +1,10 @@
|
||||
OBJS += bfin/dsputil_init.o \
|
||||
bfin/dsputil.o \
|
||||
bfin/fdct_bfin.o \
|
||||
bfin/hpel_pixels_no_rnd.o \
|
||||
bfin/idct_bfin.o \
|
||||
bfin/pixels.o \
|
||||
|
||||
OBJS-$(CONFIG_HPELDSP) += bfin/hpeldsp_init.o
|
||||
OBJS-$(CONFIG_DSPUTIL) += bfin/dsputil_init.o \
|
||||
bfin/dsputil.o \
|
||||
bfin/fdct_bfin.o \
|
||||
bfin/idct_bfin.o \
|
||||
bfin/pixels.o
|
||||
OBJS-$(CONFIG_HPELDSP) += bfin/hpeldsp_init.o \
|
||||
bfin/hpel_pixels_no_rnd.o \
|
||||
bfin/pixels.o
|
||||
OBJS-$(CONFIG_VP3DSP) += bfin/vp3dsp_init.o \
|
||||
bfin/vp3dsp.o
|
||||
|
@ -1,7 +1,6 @@
|
||||
OBJS += ppc/dsputil_ppc.o \
|
||||
ppc/fmtconvert_altivec.o \
|
||||
ppc/videodsp_ppc.o \
|
||||
OBJS += ppc/fmtconvert_altivec.o \
|
||||
|
||||
OBJS-$(CONFIG_DSPUTIL) += ppc/dsputil_ppc.o
|
||||
OBJS-$(CONFIG_FFT) += ppc/fft_altivec.o
|
||||
OBJS-$(CONFIG_H264CHROMA) += ppc/h264chroma_init.o
|
||||
OBJS-$(CONFIG_H264DSP) += ppc/h264dsp.o
|
||||
@ -10,11 +9,12 @@ OBJS-$(CONFIG_HPELDSP) += ppc/hpeldsp_altivec.o
|
||||
OBJS-$(CONFIG_MPEGAUDIODSP) += ppc/mpegaudiodsp_altivec.o
|
||||
OBJS-$(CONFIG_MPEGVIDEO) += ppc/mpegvideo_altivec.o
|
||||
OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o
|
||||
OBJS-$(CONFIG_VIDEODSP) += ppc/videodsp_ppc.o
|
||||
OBJS-$(CONFIG_VORBIS_DECODER) += ppc/vorbisdsp_altivec.o
|
||||
OBJS-$(CONFIG_VP3DSP) += ppc/vp3dsp_altivec.o
|
||||
OBJS-$(CONFIG_VP8_DECODER) += ppc/vp8dsp_altivec.o
|
||||
|
||||
ALTIVEC-OBJS += ppc/dsputil_altivec.o \
|
||||
ALTIVEC-OBJS-$(CONFIG_DSPUTIL) += ppc/dsputil_altivec.o \
|
||||
ppc/fdct_altivec.o \
|
||||
ppc/gmc_altivec.o \
|
||||
ppc/idct_altivec.o \
|
||||
|
Loading…
Reference in New Issue
Block a user