Merge commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 22:23:15 +0000 (00:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 22:23:28 +0000 (00:23 +0200)
* commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5':
  fft-test: Drop unnecessary #ifdefs around header includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/fft-test.c

Simple merge