* commit '635ec127':
  dsputil: Merge variable declarations and initializations

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