[SCM] libav/experimental: ppc: fft: Build AltiVec optimizations in the standard way

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Jul 31 04:46:50 2014 -0700

    ppc: fft: Build AltiVec optimizations in the standard way

diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile
index a75d9bf..29c8415 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
similarity index 99%
rename from libavcodec/ppc/fft_altivec_s.S
rename to libavcodec/ppc/fft_altivec.S
index 958d7df..c92b30b 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
similarity index 100%
rename from libavcodec/ppc/fft_altivec.c
rename to libavcodec/ppc/fft_init.c

-- 
Libav/FFmpeg packaging