From: Derek Buitenhuis Date: Mon, 12 Oct 2015 18:25:51 +0000 (-0300) Subject: avcodec: Don't lock on init for codecs without an init function X-Git-Tag: n3.0~2179 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=1156b634c18fcbaa0d107df8135578031242815c;hp=ccd3b3df39de4c2c4e30fb2012675f99e56dbc5e avcodec: Don't lock on init for codecs without an init function Signed-off-by: Derek Buitenhuis --- 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);