Merge commit '09d4389de10b03ea65a84eaf3d6c4b7a7538ad75'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 14:40:50 +0000 (15:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 14:41:02 +0000 (15:41 +0100)
* commit '09d4389de10b03ea65a84eaf3d6c4b7a7538ad75':
  hpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions

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

Simple merge