* commit 'c65d67ef50241886b9749e88fd333c52090f70c7': aarch64: hpeldsp NEON optimizations Conflicts: libavcodec/hpeldsp.c libavcodec/hpeldsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ported from ARMv7 NEON.