From 1156b634c18fcbaa0d107df8135578031242815c Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Mon, 12 Oct 2015 15:25:51 -0300 Subject: avcodec: Don't lock on init for codecs without an init function Signed-off-by: Derek Buitenhuis --- libavcodec/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 175106714d..0e4f3c0964 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -3266,7 +3266,7 @@ int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)) int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec) { - if (codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE) + if (codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE || !codec->init) return 0; if (lockmgr_cb) { @@ -3292,7 +3292,7 @@ int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec) int ff_unlock_avcodec(const AVCodec *codec) { - if (codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE) + if (codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE || !codec->init) return 0; av_assert0(ff_avcodec_locked); -- cgit v1.2.3