Merge commit 'd90133b77bf69667d10e54de9aae7da223c6876a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 19:34:28 +0000 (21:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 19:37:53 +0000 (21:37 +0200)
commita649650a0ea0f6b735084fc0055d574af1600017
tree1c0afad355e8a8f6187b1cd06a5b9b085ea62e8b
parent0d3821a6df9688f06aa3c57049a73250b5b6871c
parentd90133b77bf69667d10e54de9aae7da223c6876a
Merge commit 'd90133b77bf69667d10e54de9aae7da223c6876a'

* commit 'd90133b77bf69667d10e54de9aae7da223c6876a':
  asvenc: Mark codec as init-thread-safe and init-cleanup

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