diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-13 21:08:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-13 21:08:28 +0200 |
| commit | 98227ba5fa456b5dacd404e125420c9abf87ff95 (patch) | |
| tree | b88171365f9893647c0b7b323bf46e538757fb08 /libavcodec/ppc/Makefile | |
| parent | 4cc0f79a2c11f4ef53ee1b1199896832915a668e (diff) | |
| parent | a8552ee3eb335d2fd2d6c99363367a6090298f78 (diff) | |
| download | ffmpeg-98227ba5fa456b5dacd404e125420c9abf87ff95.tar.gz | |
Merge commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78'
* commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78':
ppc: dsputil: Coalesce all init files
Conflicts:
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc/Makefile')
| -rw-r--r-- | libavcodec/ppc/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile index bfa4d05578..6305904fa7 100644 --- a/libavcodec/ppc/Makefile +++ b/libavcodec/ppc/Makefile @@ -2,7 +2,7 @@ OBJS += ppc/fmtconvert_altivec.o \ OBJS-$(CONFIG_AUDIODSP) += ppc/audiodsp.o OBJS-$(CONFIG_BLOCKDSP) += ppc/blockdsp.o -OBJS-$(CONFIG_DSPUTIL) += ppc/dsputil_ppc.o +OBJS-$(CONFIG_DSPUTIL) += ppc/dsputil_altivec.o OBJS-$(CONFIG_FFT) += ppc/fft_altivec.o OBJS-$(CONFIG_H264CHROMA) += ppc/h264chroma_init.o OBJS-$(CONFIG_H264DSP) += ppc/h264dsp.o ppc/hpeldsp_altivec.o @@ -26,8 +26,6 @@ OBJS-$(CONFIG_VORBIS_DECODER) += ppc/vorbisdsp_altivec.o OBJS-$(CONFIG_VP7_DECODER) += ppc/vp8dsp_altivec.o OBJS-$(CONFIG_VP8_DECODER) += ppc/vp8dsp_altivec.o -ALTIVEC-OBJS-$(CONFIG_DSPUTIL) += ppc/dsputil_altivec.o \ - FFT-OBJS-$(HAVE_GNU_AS) += ppc/fft_altivec_s.o FFT-OBJS-$(HAVE_VSX) += ppc/fft_vsx.o ALTIVEC-OBJS-$(CONFIG_FFT) += $(FFT-OBJS-yes) |