[FFmpeg-cvslog] Merge commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 24 00:35:40 2014 +0200| [074bb7515e33780be35dd62e881cacd485cea382] | committer: Michael Niedermayer

Merge commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9'

* commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9':
  fft-test: Check memory allocations

Conflicts:
	libavcodec/fft-test.c

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

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