Merge commit 'c3418201307c6b7a2b3e3be10f33ab4a20a32c3b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 01:55:59 +0000 (03:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 01:56:32 +0000 (03:56 +0200)
* commit 'c3418201307c6b7a2b3e3be10f33ab4a20a32c3b':
  jpeglsenc: Mark codec as init-thread-safe and init-cleanup

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

Simple merge