* commit '92ba9651':
  dsputil: Move draw_edges and clear_block* out of dsputil_template

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