* commit '945673f7':
  dsputil_template: K&R formatting cosmetics

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