[FFmpeg-cvslog] Merge commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 24 01:50:01 2014 +0200| [ab0f78ea77779e9f87015910ef235b6d1e6d2ccb] | committer: Michael Niedermayer

Merge commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4'

* commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4':
  fft-test: Pass correct struct members to (i)dct functions

Conflicts:
	libavcodec/fft-test.c

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

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