[FFmpeg-cvslog] Merge commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 30 20:35:23 2014 +0200| [3ef8b4322cba2ebf9fd6b1c15d068ee90e9f9f96] | committer: Michael Niedermayer

Merge commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea' into release/2.2

* commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea':
  fate: Add dependencies for dct/fft/mdct/rdft tests

Conflicts:
	libavcodec/fft-test.c
	tests/fate/fft.mak

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

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