* commit 'cce791b1':
  hpeldsp_template: Merge some declarations and initializations

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