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)
* commit 'bb428e00ac158244d6691bf135be404e85b66a8b':
  hqx: Mark codec as init-thread-safe and init-cleanup

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

Simple merge