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)
commit146e498c9eb1fe7a17191b910fd481ddc9c260ba
tree6a6b6bc093f800c9e8e83709c28a8f84c507a919
parent1d8d21b90ab91aa471f369e0f9d1ea20fb40733b
parentffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8
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>
libavcodec/ppc/Makefile
libavcodec/ppc/fft_altivec.S
libavcodec/ppc/fft_init.c