diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-02 19:40:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-02 19:40:18 +0200 |
| commit | 146e498c9eb1fe7a17191b910fd481ddc9c260ba (patch) | |
| tree | 6a6b6bc093f800c9e8e83709c28a8f84c507a919 | |
| parent | 1d8d21b90ab91aa471f369e0f9d1ea20fb40733b (diff) | |
| parent | ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8 (diff) | |
| download | ffmpeg-146e498c9eb1fe7a17191b910fd481ddc9c260ba.tar.gz | |
Merge commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8'
* commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8':
ppc: fft: Build AltiVec optimizations in the standard way
Conflicts:
libavcodec/ppc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ppc/Makefile | 8 | ||||
| -rw-r--r-- | libavcodec/ppc/fft_altivec.S (renamed from libavcodec/ppc/fft_altivec_s.S) | 5 | ||||
| -rw-r--r-- | libavcodec/ppc/fft_init.c (renamed from libavcodec/ppc/fft_altivec.c) | 0 |
3 files changed, 8 insertions, 5 deletions
diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile index 50cf411d81..de7a7c72b3 100644 --- a/libavcodec/ppc/Makefile +++ b/libavcodec/ppc/Makefile @@ -2,7 +2,9 @@ OBJS += ppc/fmtconvert_altivec.o \ OBJS-$(CONFIG_AUDIODSP) += ppc/audiodsp.o OBJS-$(CONFIG_BLOCKDSP) += ppc/blockdsp.o -OBJS-$(CONFIG_FFT) += ppc/fft_altivec.o +OBJS-$(CONFIG_FFT) += ppc/fft_init.o \ + ppc/fft_altivec.o \ + ppc/fft_vsx.o OBJS-$(CONFIG_H264CHROMA) += ppc/h264chroma_init.o OBJS-$(CONFIG_H264DSP) += ppc/h264dsp.o ppc/hpeldsp_altivec.o OBJS-$(CONFIG_H264QPEL) += ppc/h264qpel.o @@ -25,7 +27,3 @@ OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o OBJS-$(CONFIG_VORBIS_DECODER) += ppc/vorbisdsp_altivec.o OBJS-$(CONFIG_VP7_DECODER) += ppc/vp8dsp_altivec.o OBJS-$(CONFIG_VP8_DECODER) += ppc/vp8dsp_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) diff --git a/libavcodec/ppc/fft_altivec_s.S b/libavcodec/ppc/fft_altivec.S index 16ce838c97..aab669ea45 100644 --- a/libavcodec/ppc/fft_altivec_s.S +++ b/libavcodec/ppc/fft_altivec.S @@ -39,6 +39,9 @@ */ #include "config.h" + +#if HAVE_GNU_AS && HAVE_ALTIVEC + #include "asm.S" .text @@ -447,3 +450,5 @@ fft_dispatch_tab\suffix\()_altivec: DECL_FFTS 0 DECL_FFTS 1, _interleave + +#endif /* HAVE_GNU_AS && HAVE_ALTIVEC */ diff --git a/libavcodec/ppc/fft_altivec.c b/libavcodec/ppc/fft_init.c index 675fa33a95..675fa33a95 100644 --- a/libavcodec/ppc/fft_altivec.c +++ b/libavcodec/ppc/fft_init.c |