* commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493': sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp Conflicts: libavcodec/hpeldsp.h libavcodec/sparc/dsputil_vis.c libavcodec/sparc/hpeldsp_vis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>