[FFmpeg-cvslog] Merge commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 26 15:53:33 2014 +0100| [b7f0d39d2629f0a1854adbda74c434a0754e9fa1] | committer: Michael Niedermayer

Merge commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6'

* commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6':
  hpeldsp_template: Move content to hpeldsp

Conflicts:
	libavcodec/hpeldsp_template.c

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

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