mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-07 00:20:09 +02:00
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>
This commit is contained in:
commit
146e498c9e
@ -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)
|
||||
|
@ -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 */
|
Loading…
Reference in New Issue
Block a user