* commit '7384b7a71338d960e421d6dc3d77da09b0a442cb': arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp Conflicts: libavcodec/arm/Makefile libavcodec/arm/hpeldsp_arm.S libavcodec/arm/hpeldsp_arm.h libavcodec/arm/hpeldsp_armv6.S libavcodec/arm/hpeldsp_init_arm.c libavcodec/arm/hpeldsp_init_armv6.c libavcodec/arm/hpeldsp_init_neon.c libavcodec/arm/hpeldsp_neon.S libavcodec/hpeldsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>