[FFmpeg-cvslog] Merge commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 23 20:40:41 2014 +0200| [09f5b3750f2d8164497ff4bdca74d01c9b25a361] | committer: Michael Niedermayer

Merge commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb'

* commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb':
  fft-test: Reduce variable scope where sensibly possible

Conflicts:
	libavcodec/fft-test.c

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

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