[FFmpeg-cvslog] Merge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 23 00:29:06 2014 +0200| [9515d7c629cdd71c68bced05ea235aad08b768ce] | committer: Michael Niedermayer

Merge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'

* commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc':
  fft-test: Comment some #endifs

Conflicts:
	libavcodec/fft-test.c

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

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