[FFmpeg-cvslog] Merge commit '7288b345850792430302a8f85a4b29140b770497'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 23 20:48:05 2014 +0200| [088875b6b8553cfa591a5edafd3652e4bb80c695] | committer: Michael Niedermayer

Merge commit '7288b345850792430302a8f85a4b29140b770497'

* commit '7288b345850792430302a8f85a4b29140b770497':
  fft-test: Drop unnecessary pointer indirection for context structs

Conflicts:
	libavcodec/fft-test.c

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

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