Merge commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Aug 2014 17:40:18 +0000 (19:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Aug 2014 17:40:18 +0000 (19:40 +0200)
* commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8':
  ppc: fft: Build AltiVec optimizations in the standard way

Conflicts:
libavcodec/ppc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/ppc/Makefile
libavcodec/ppc/fft_altivec.S
libavcodec/ppc/fft_init.c

@@@ -2,9 -2,10 +2,11 @@@ OBJS                                   
  
  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_altivec.o             \
++                                          ppc/fft_vsx.o
  OBJS-$(CONFIG_H264CHROMA)              += ppc/h264chroma_init.o
 -OBJS-$(CONFIG_H264DSP)                 += ppc/h264dsp.o
 +OBJS-$(CONFIG_H264DSP)                 += ppc/h264dsp.o ppc/hpeldsp_altivec.o
  OBJS-$(CONFIG_H264QPEL)                += ppc/h264qpel.o
  OBJS-$(CONFIG_HPELDSP)                 += ppc/hpeldsp_altivec.o
  OBJS-$(CONFIG_HUFFYUVDSP)              += ppc/huffyuvdsp_altivec.o
Simple merge
Simple merge