[FFmpeg-cvslog] Merge commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  1 18:02:36 2013 +0200| [ebd99ff112e8993330dd39959c22dfe1ab17d5c0] | committer: Michael Niedermayer

Merge commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf'

* commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf':
  fft: Remove pointless #ifdefs around function declarations
  ppc: Move AltiVec utility headers out of AltiVec ifdefs

Conflicts:
	libavcodec/fft.h

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

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