Merge commit '74a1cad7e3ba79e5b1e5b2e2bcf6179520442679'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 20:20:41 +0000 (22:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 20:21:00 +0000 (22:21 +0200)
commit9ba1c62775ca542aa71789de686170dbac609bc8
treef26e2284d146c67cb5c0ddf3a225d4d0c15e01d5
parent8d5088a168d13cfb8f21ee8de0dc8477982ea7d6
parent74a1cad7e3ba79e5b1e5b2e2bcf6179520442679
Merge commit '74a1cad7e3ba79e5b1e5b2e2bcf6179520442679'

* commit '74a1cad7e3ba79e5b1e5b2e2bcf6179520442679':
  lclenc: Mark codec as init-thread-safe and init-cleanup

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