* commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2': x86: dsputil hpeldsp: Move shared template functions into separate object Conflicts: libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>