
* commit '3aa682f25324d811ec284edc808eb71a46eae950': swscale: consistent names for arch-specific acceleration functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '3aa682f25324d811ec284edc808eb71a46eae950': swscale: consistent names for arch-specific acceleration functions Merged-by: Michael Niedermayer <michaelni@gmx.at>