* qatar/master:
  dsputil: Separate h264 qpel

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