aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-07-31 04:46:50 -0700
committerDiego Biurrun <diego@biurrun.de>2014-08-02 07:40:37 -0700
commitffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8 (patch)
tree2b9dd1a2741f902d69f5c6254f2efde9b30e95b3 /libavcodec
parentf0e959481968b6d906931127237ed981b6414f6e (diff)
downloadffmpeg-ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8.tar.gz
ppc: fft: Build AltiVec optimizations in the standard way
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ppc/Makefile6
-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, 7 insertions, 4 deletions
diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile
index a75d9bf9a0..29c8415059 100644
--- a/libavcodec/ppc/Makefile
+++ b/libavcodec/ppc/Makefile
@@ -2,7 +2,8 @@ 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
OBJS-$(CONFIG_H264CHROMA) += ppc/h264chroma_init.o
OBJS-$(CONFIG_H264DSP) += ppc/h264dsp.o
OBJS-$(CONFIG_H264QPEL) += ppc/h264qpel.o
@@ -25,6 +26,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
-ALTIVEC-OBJS-$(CONFIG_FFT) += $(FFT-OBJS-yes)
diff --git a/libavcodec/ppc/fft_altivec_s.S b/libavcodec/ppc/fft_altivec.S
index 958d7df0ee..c92b30b897 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 8fcc033b53..8fcc033b53 100644
--- a/libavcodec/ppc/fft_altivec.c
+++ b/libavcodec/ppc/fft_init.c