diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:12:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:12:11 +0100 |
| commit | 3775224b2f8a9c2c0bf5d53272236d4a1ffb0875 (patch) | |
| tree | 2125e454ac53d8e5e01f3b70e28206308e8a2197 /libavcodec | |
| parent | ba85bfabf3a1b762b3e07f53d404f4c7c4e1703a (diff) | |
| parent | 54a6e08a650a71fd375551585b0ea40a3a06d228 (diff) | |
| download | ffmpeg-3775224b2f8a9c2c0bf5d53272236d4a1ffb0875.tar.gz | |
Merge commit '54a6e08a650a71fd375551585b0ea40a3a06d228'
* commit '54a6e08a650a71fd375551585b0ea40a3a06d228':
dsputil: Conditionally compile dsputil code on all architectures
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/bfin/Makefile | 16 | ||||
| -rw-r--r-- | libavcodec/ppc/Makefile | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/bfin/Makefile b/libavcodec/bfin/Makefile index 193f8e6700..efdcbfc69f 100644 --- a/libavcodec/bfin/Makefile +++ b/libavcodec/bfin/Makefile @@ -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 diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile index 71b23da10e..6656ffb985 100644 --- a/libavcodec/ppc/Makefile +++ b/libavcodec/ppc/Makefile @@ -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 \ |