diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 21:48:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 21:48:27 +0200 |
| commit | f2978aa7ed0faa768fc438b55a45c2e007124ffe (patch) | |
| tree | 19562c05e257375ceb1a950290b24d4474bd5814 /libavcodec/huffyuvenc.c | |
| parent | a649650a0ea0f6b735084fc0055d574af1600017 (diff) | |
| parent | 43171886e08b6a2f20a1e2f3ecc95a7984b591cd (diff) | |
Merge commit '43171886e08b6a2f20a1e2f3ecc95a7984b591cd'
* commit '43171886e08b6a2f20a1e2f3ecc95a7984b591cd':
huffyuvenc: Mark codec as init-thread-safe and init-cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/huffyuvenc.c')
| -rw-r--r-- | libavcodec/huffyuvenc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index c7e69d5cee..f0179dfa5b 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -1080,6 +1080,8 @@ AVCodec ff_huffyuv_encoder = { AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, }; #if CONFIG_FFVHUFF_ENCODER @@ -1112,5 +1114,7 @@ AVCodec ff_ffvhuff_encoder = { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, }; #endif |