[FFmpeg-cvslog] Merge commit '72cebae0d981dde144340cf51f3c323f01e215e5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 31 21:38:58 2015 +0200| [e8676c758a627efc1744e2084c01e832c03ed2d0] | committer: Michael Niedermayer

Merge commit '72cebae0d981dde144340cf51f3c323f01e215e5'

* commit '72cebae0d981dde144340cf51f3c323f01e215e5':
  ppc: avutil: Use the abriged vector types

Conflicts:
	libavutil/ppc/float_dsp_altivec.c
	libavutil/ppc/util_altivec.h

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

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