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)
commit92b2404571bcdd294d6ef0e614eee55432e959a7
tree7fffd1accfd7018a2a9eb9c169f0e6df6dcb8d00
parent390452bab627c8c2ccd316ac71106ca6d7ca190c
parent4c642d8d98703faf52983243098f35865e15b312
Merge commit '4c642d8d98703faf52983243098f35865e15b312'

* commit '4c642d8d98703faf52983243098f35865e15b312':
  x86: hpeldsp: Add missing av_cold attribute to init function

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