Merge commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 21:24:31 +0000 (22:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 21:24:43 +0000 (22:24 +0100)
* commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b':
  libavcodec: Don't use av_cold annotation in twinvq header file

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

Simple merge