[FFmpeg-cvslog] Merge commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 20 21:08:30 2014 +0100| [75cc29a8a8e68aaa81c549f563521c64ed4e2caf] | committer: Michael Niedermayer

Merge commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e'

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

Conflicts:
	libavcodec/hpeldsp_template.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75cc29a8a8e68aaa81c549f563521c64ed4e2caf
---