Merge commit '3aa682f25324d811ec284edc808eb71a46eae950'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 13:41:00 +0000 (15:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 13:41:05 +0000 (15:41 +0200)
commitc5cec9a42bec60894d63467cb0fd4976128d49af
treec9e66838caee473a7d880bc88ab3f0544e2a7f16
parent5ff1b588eb4e639f0b3cfeff2118aadb2b43584a
parent3aa682f25324d811ec284edc808eb71a46eae950
Merge commit '3aa682f25324d811ec284edc808eb71a46eae950'

* commit '3aa682f25324d811ec284edc808eb71a46eae950':
  swscale: consistent names for arch-specific acceleration functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/bfin/swscale_bfin.c
libswscale/bfin/yuv2rgb_bfin.c
libswscale/ppc/yuv2yuv_altivec.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/yuv2rgb.c