[FFmpeg-cvslog] Merge commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 23 00:23:15 2014 +0200| [9eeedf87699837cd18df567a8d9d148009737b04] | committer: Michael Niedermayer

Merge commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5'

* commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5':
  fft-test: Drop unnecessary #ifdefs around header includes

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9eeedf87699837cd18df567a8d9d148009737b04
---