Merge commit 'bb428e00ac158244d6691bf135be404e85b66a8b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 20:00:28 +0000 (22:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 20:00:35 +0000 (22:00 +0200)
commit8d5088a168d13cfb8f21ee8de0dc8477982ea7d6
treeecdeb4439e814f156e33b038568346fd0ca8d69e
parentf2978aa7ed0faa768fc438b55a45c2e007124ffe
parentbb428e00ac158244d6691bf135be404e85b66a8b
Merge commit 'bb428e00ac158244d6691bf135be404e85b66a8b'

* commit 'bb428e00ac158244d6691bf135be404e85b66a8b':
  hqx: Mark codec as init-thread-safe and init-cleanup

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