From 5ffadec30aaa428a2c015268e80a2fb9811e47c3 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 16 Oct 2012 13:30:52 +0200 Subject: [PATCH] lavc/utils: propagate or return meaningful error codes in avcodec_open2() --- libavcodec/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2ec28a729d..3980f46a3f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -849,14 +849,14 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code /* If there is a user-supplied mutex locking routine, call it. */ if (ff_lockmgr_cb) { - if ((*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN)) - return -1; + if ((ret = (*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN)) < 0) + return ret; } entangled_thread_counter++; if (entangled_thread_counter != 1) { av_log(avctx, AV_LOG_ERROR, "Insufficient thread locking around avcodec_open/close()\n"); - ret = -1; + ret = AVERROR(EINVAL); goto end; }