Merge commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 14:53:33 +0000 (15:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 14:53:33 +0000 (15:53 +0100)
* commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6':
  hpeldsp_template: Move content to hpeldsp

Conflicts:
libavcodec/hpeldsp_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/hpeldsp.c

Simple merge