[FFmpeg-cvslog] Merge commit '74a1cad7e3ba79e5b1e5b2e2bcf6179520442679'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 24 22:20:41 2015 +0200| [9ba1c62775ca542aa71789de686170dbac609bc8] | committer: Michael Niedermayer

Merge commit '74a1cad7e3ba79e5b1e5b2e2bcf6179520442679'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ba1c62775ca542aa71789de686170dbac609bc8
---