diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 21:34:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 21:37:53 +0200 |
| commit | a649650a0ea0f6b735084fc0055d574af1600017 (patch) | |
| tree | 1c0afad355e8a8f6187b1cd06a5b9b085ea62e8b | |
| parent | 0d3821a6df9688f06aa3c57049a73250b5b6871c (diff) | |
| parent | d90133b77bf69667d10e54de9aae7da223c6876a (diff) | |
| download | ffmpeg-a649650a0ea0f6b735084fc0055d574af1600017.tar.gz | |
Merge commit 'd90133b77bf69667d10e54de9aae7da223c6876a'
* commit 'd90133b77bf69667d10e54de9aae7da223c6876a':
asvenc: Mark codec as init-thread-safe and init-cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/asvenc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index f7d1f7013d..e6f5a1a252 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -361,6 +361,8 @@ AVCodec ff_asv1_encoder = { .encode2 = encode_frame, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, }; #endif @@ -375,5 +377,7 @@ AVCodec ff_asv2_encoder = { .encode2 = encode_frame, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, }; #endif |