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)
commit0a1146a59a1c0a97e879cd2683b01db59d9a5144
treea8ab1ed80553f286eed21e5a960745b8ef513c8e
parent7b7f8d3ed03d5d8f6c042644bf82a86ae2f996e4
parentb8d18a94376c44dac9523dc3317259a30fc92f8b
Merge commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b'

* commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b':
  libavcodec: Don't use av_cold annotation in twinvq header file

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