[FFmpeg-cvslog] Merge commit 'f61bece684d9685b07895508e6c1c733b5564ccf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 29 14:23:28 2013 +0200| [29daad5b98bc07b9669c22b39113f5568ef1c570] | committer: Michael Niedermayer

Merge commit 'f61bece684d9685b07895508e6c1c733b5564ccf'

* commit 'f61bece684d9685b07895508e6c1c733b5564ccf':
  ppc: Add and use convenience macro to check for AltiVec availability

Conflicts:
	libavcodec/ppc/dsputil_ppc.c

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

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