[FFmpeg-cvslog] Merge commit '3aa682f25324d811ec284edc808eb71a46eae950'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 29 15:41:00 2013 +0200| [c5cec9a42bec60894d63467cb0fd4976128d49af] | committer: Michael Niedermayer

Merge commit '3aa682f25324d811ec284edc808eb71a46eae950'

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

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

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