Merge commit '24af1aa0f70362a66cda04c9d7cd012e019f5572'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 19:43:14 +0000 (21:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 19:43:50 +0000 (21:43 +0200)
commitcff61d595e453c15e37f4fdfdb3dba93d19f5fa9
tree9a792539950a03ba6f33a2b48989338257e7786e
parent29119aff6cc7ebe6d3f46cc11cf91aaa4f37904b
parent24af1aa0f70362a66cda04c9d7cd012e019f5572
Merge commit '24af1aa0f70362a66cda04c9d7cd012e019f5572'

* commit '24af1aa0f70362a66cda04c9d7cd012e019f5572':
  fft: Convert FFT/MDCT permutation type #defines to enums

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/fft.h