* commit '110796739ab32854dc0b6b0a1c95e6ae98889062': x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c Conflicts: libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
The function is only instantiated once, so there is no point in keeping it in a template file.