* commit '2957d29f0531ccd8a6f4378293424dfd92db3044': alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp Conflicts: libavcodec/alpha/dsputil_alpha.c libavcodec/alpha/hpeldsp_alpha.c libavcodec/alpha/hpeldsp_alpha.h libavcodec/alpha/hpeldsp_alpha_asm.S libavcodec/hpeldsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>