* commit '46bb4568':
  x86: dsputil: Refactor pixels16 wrapper functions with a macro

Conflicts:
	libavcodec/x86/hpeldsp_avg_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>