diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 22:20:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 22:21:00 +0200 |
| commit | 9ba1c62775ca542aa71789de686170dbac609bc8 (patch) | |
| tree | f26e2284d146c67cb5c0ddf3a225d4d0c15e01d5 /libavcodec/lclenc.c | |
| parent | 8d5088a168d13cfb8f21ee8de0dc8477982ea7d6 (diff) | |
| parent | 74a1cad7e3ba79e5b1e5b2e2bcf6179520442679 (diff) | |
| download | ffmpeg-9ba1c62775ca542aa71789de686170dbac609bc8.tar.gz | |
Merge commit '74a1cad7e3ba79e5b1e5b2e2bcf6179520442679'
* commit '74a1cad7e3ba79e5b1e5b2e2bcf6179520442679':
lclenc: Mark codec as init-thread-safe and init-cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lclenc.c')
| -rw-r--r-- | libavcodec/lclenc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c index 864adc9850..bce1d537a2 100644 --- a/libavcodec/lclenc.c +++ b/libavcodec/lclenc.c @@ -199,4 +199,6 @@ AVCodec ff_zlib_encoder = { .close = encode_end, .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, }; |