Merge commit 'eae7338e1592f4a398b7c3cb9d1ac854b7a44ff8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 20:21:12 +0000 (22:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 20:21:17 +0000 (22:21 +0200)
commitc180f0f6d3981a93242c3ecabd6667434434ea03
tree30421a92eaabe01553c60ef650f1d37b00c06d96
parent9ba1c62775ca542aa71789de686170dbac609bc8
parenteae7338e1592f4a398b7c3cb9d1ac854b7a44ff8
Merge commit 'eae7338e1592f4a398b7c3cb9d1ac854b7a44ff8'

* commit 'eae7338e1592f4a398b7c3cb9d1ac854b7a44ff8':
  libx264: Make codec use the init-cleanup flag and mark it as init-thread-safe

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