Merge commit '4c642d8d98703faf52983243098f35865e15b312'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jan 2014 19:32:43 +0000 (20:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jan 2014 19:32:53 +0000 (20:32 +0100)
* commit '4c642d8d98703faf52983243098f35865e15b312':
  x86: hpeldsp: Add missing av_cold attribute to init function

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

Simple merge