[FFmpeg-cvslog] Merge commit 'c3418201307c6b7a2b3e3be10f33ab4a20a32c3b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 03:55:59 2015 +0200| [966a57b6e918d87e94d8457dfed457e087ceddf4] | committer: Michael Niedermayer

Merge commit 'c3418201307c6b7a2b3e3be10f33ab4a20a32c3b'

* commit 'c3418201307c6b7a2b3e3be10f33ab4a20a32c3b':
  jpeglsenc: 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=966a57b6e918d87e94d8457dfed457e087ceddf4
---