Merge commit '72cebae0d981dde144340cf51f3c323f01e215e5'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 19:38:58 +0000 (21:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 19:38:58 +0000 (21:38 +0200)
commite8676c758a627efc1744e2084c01e832c03ed2d0
treed2c287116454898f2cf892974e45ced6fe4ef8a8
parent876a663c668165e13feb7bad829d6ac034a6d416
parent72cebae0d981dde144340cf51f3c323f01e215e5
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@gmx.at>
libavutil/ppc/float_dsp_altivec.c
libavutil/ppc/util_altivec.h