[FFmpeg-cvslog] Merge commit '6133d65861f265d429ade53e910fe877c95a1615'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 24 01:22:31 2014 +0200| [02ea384abd8ef53a1e4654ab0c9e72e08141d751] | committer: Michael Niedermayer

Merge commit '6133d65861f265d429ade53e910fe877c95a1615'

* commit '6133d65861f265d429ade53e910fe877c95a1615':
  fft-test: K&R formatting cosmetics

Conflicts:
	libavcodec/fft-test.c

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

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