[FFmpeg-cvslog] avcodec_open: if obtaining a lock fails, dont attempt to unlock it.

Michael Niedermayer git at videolan.org
Thu Dec 6 03:17:39 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec  6 02:00:12 2012 +0100| [2dec950f49049b55a4d4147673824dc817cb27e5] | committer: Michael Niedermayer

avcodec_open: if obtaining a lock fails, dont attempt to unlock it.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2dec950f49049b55a4d4147673824dc817cb27e5
---

 libavcodec/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index fc56d69..131c156 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -803,7 +803,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
 
     ret = ff_lock_avcodec(avctx);
     if (ret < 0)
-        goto end;
+        return ret;
 
     avctx->internal = av_mallocz(sizeof(AVCodecInternal));
     if (!avctx->internal) {



More information about the ffmpeg-cvslog mailing list