* commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075': bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp Conflicts: libavcodec/bfin/Makefile libavcodec/bfin/hpel_pixels_bfin.S libavcodec/bfin/hpeldsp_bfin.c libavcodec/bfin/hpeldsp_bfin.h libavcodec/hpeldsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>