* commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f': x86: dsputil: Move hpeldsp-related declarations to a separate header Conflicts: libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>