Merge commit '82ee14d2cedd7867920529b408ed6c7ec2f13ff1'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 20:09:57 +0000 (21:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 20:09:57 +0000 (21:09 +0100)
commit047cf46e97541f6941cdb00cda009684e2aff5f1
treea0b725984b2cc0160e3f6ef76bfe6627f25afbfc
parent75cc29a8a8e68aaa81c549f563521c64ed4e2caf
parent82ee14d2cedd7867920529b408ed6c7ec2f13ff1
Merge commit '82ee14d2cedd7867920529b408ed6c7ec2f13ff1'

* commit '82ee14d2cedd7867920529b408ed6c7ec2f13ff1':
  ppc: dsputil: comment formatting and wording/grammar improvements

Conflicts:
libavcodec/ppc/gmc_altivec.c
libavcodec/ppc/idct_altivec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/fdct_altivec.c
libavcodec/ppc/fft_altivec.c
libavcodec/ppc/gmc_altivec.c
libavcodec/ppc/idct_altivec.c
libavcodec/ppc/int_altivec.c