Commit 17e41cf3 authored by Derek Buitenhuis's avatar Derek Buitenhuis Committed by Luca Barbato

avcodec: Do not lock during init if there is no init function

Signed-off-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: 's avatarLuca Barbato <lu_zero@gentoo.org>
parent 34ed5c2e
...@@ -845,7 +845,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code ...@@ -845,7 +845,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
av_dict_copy(&tmp, *options, 0); av_dict_copy(&tmp, *options, 0);
/* If there is a user-supplied mutex locking routine, call it. */ /* If there is a user-supplied mutex locking routine, call it. */
if (!(codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE)) { if (!(codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE) && codec->init) {
if (lockmgr_cb) { if (lockmgr_cb) {
if ((*lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN)) if ((*lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN))
return -1; return -1;
...@@ -1086,7 +1086,7 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -1086,7 +1086,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
} }
end: end:
if (!(codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE)) { if (!(codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE) && codec->init) {
entangled_thread_counter--; entangled_thread_counter--;
/* Release any user-supplied mutex. */ /* Release any user-supplied mutex. */
......
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