Merge commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:18:18 +0000 (17:18 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:18:27 +0000 (17:18 +0000)
commit2cfb34a4e8b464d790513ad42860869677ef79d9
tree2c423509e301714dc6d0989c41ca072f041bd96e
parent259fef86bb91784f31a7e43e0d6d6a2a1d86f41c
parent47570dbde8b33001d5ccac44e7ebaaeecbcb807c
Merge commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c'

* commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c':
  fft: ppc: Place ff_fft_calc_interleave_altivec() under correct ifdefs

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/ppc/fft_altivec.S
libavcodec/ppc/fft_init.c