* commit '054013a0':
  dsputil: Move APE-specific bits into apedsp

Conflicts:
	libavcodec/arm/int_neon.S
	libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>