Commit f2978aa7 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '43171886'

* commit '43171886':
  huffyuvenc: Mark codec as init-thread-safe and init-cleanup
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a649650a 43171886
...@@ -1080,6 +1080,8 @@ AVCodec ff_huffyuv_encoder = { ...@@ -1080,6 +1080,8 @@ AVCodec ff_huffyuv_encoder = {
AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24, AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24,
AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE
}, },
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP,
}; };
#if CONFIG_FFVHUFF_ENCODER #if CONFIG_FFVHUFF_ENCODER
...@@ -1112,5 +1114,7 @@ AVCodec ff_ffvhuff_encoder = { ...@@ -1112,5 +1114,7 @@ AVCodec ff_ffvhuff_encoder = {
AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB24,
AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE
}, },
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP,
}; };
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment