diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 03:55:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 03:56:32 +0200 |
| commit | 966a57b6e918d87e94d8457dfed457e087ceddf4 (patch) | |
| tree | 9fba493d0e83cbcf1ac2a2908398004c80d1d882 /libavcodec/jpeglsenc.c | |
| parent | 27801500eed36a19adc89a395e45085ddb9d8969 (diff) | |
| parent | c3418201307c6b7a2b3e3be10f33ab4a20a32c3b (diff) | |
| download | ffmpeg-966a57b6e918d87e94d8457dfed457e087ceddf4.tar.gz | |
Merge commit 'c3418201307c6b7a2b3e3be10f33ab4a20a32c3b'
* commit 'c3418201307c6b7a2b3e3be10f33ab4a20a32c3b':
jpeglsenc: Mark codec as init-thread-safe and init-cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsenc.c')
| -rw-r--r-- | libavcodec/jpeglsenc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index 99a48b68e6..d2749101ed 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -452,4 +452,6 @@ AVCodec ff_jpegls_encoder = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16, AV_PIX_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, }; |