From patchwork Wed Dec 2 04:21:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24247 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D1ED144A255 for ; Wed, 2 Dec 2020 06:23:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B8F88689E47; Wed, 2 Dec 2020 06:23:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64F55689CFA for ; Wed, 2 Dec 2020 06:23:34 +0200 (EET) Received: by mail-ed1-f68.google.com with SMTP id d18so1156287edt.7 for ; Tue, 01 Dec 2020 20:23:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=eYwtjiJyjPbn2mGbl6KfHD+GavX4nRKCJ91odZ33iiA=; b=U/kqgZghBv/z7lAQO9jcRmNg/eulcG4qVViPfJxGTeLZT5cPz25AyFrDIRk0Eii4vf JOLSpFkeH+rTO9uOJU82SrzDTqDAgcF6eHe0+SmiHpYJ+L3gGEp/mbJFlFFI/TX7LmKi 4H+8bJRFshk1Z/GZ9ki+AGmfjABHgzekKWVYXsdpnUTMCFP6NfP6GgtGV6wiZmnGEm9T WsCDchoBbsfMtscSO3eNfaU78kxaUXgIDwVogEdRlv9rabGKQgdTg+2YAjiwET+NuBou rX8en1r9LwzeX9Acf32P+06a8+4X27GGlOWNey2I5MDIbQaJ7QsGUA27/S9Fg5ZhW0nF 4uzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=eYwtjiJyjPbn2mGbl6KfHD+GavX4nRKCJ91odZ33iiA=; b=ni4WI006Pk+bk32rbZpOWskxt2gxatB4w3IevMcEwZsMOkbQNsJ7JASwX11b1TBZxG SBi2hHCPNwZDs9cDL26h1qH6LEnaCQVS/e7ANfp8NJi5+zlLePo5nCF8hNW4wUQekZl0 CqIYSbyQNMwYVUgHtTNxr4B7DO1wehSJTfNbcCtw6m7p/uF9NIoBTO6wQJFXLMWh728j vBCcV7XjTjQ/e20z7x6+EENiZjSjDbjGGLM06eCt5O9e3vZqLRxGVCjxzPHo2tVbYADF ZLM8xmzuCkwvdbx+85AZO009LYfBQVWwD2pkImkyTNjzZg/lPuV/iXZoQpvWx6allhKc wswg== X-Gm-Message-State: AOAM532Tfw65aaPBEa6mwYmpwig8GnnDcLEMWQM+Fx6q6HS8JN6bRnE5 kCZDyf+G0xX6rr1NASsBxpTtKZl8z8RRxA== X-Google-Smtp-Source: ABdhPJzvPhnmKPqljyrV4Wjhi6PQF7cSQ+8ZTgUfqX+k2SK7OB6ul3ZRvfDki9GDdnXr6Kk2Zzw+ww== X-Received: by 2002:a50:e0ce:: with SMTP id j14mr863735edl.18.1606883013692; Tue, 01 Dec 2020 20:23:33 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id mc25sm265087ejb.58.2020.12.01.20.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 20:23:33 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Dec 2020 05:21:37 +0100 Message-Id: <20201202042244.519127-16-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> References: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 150/217] avcodec/utvideoenc: Cleanup generically on init failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/utvideoenc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index eea685f600..5dbfed59a3 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -195,7 +195,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (!avctx->extradata) { av_log(avctx, AV_LOG_ERROR, "Could not allocate extradata.\n"); - utvideo_encode_close(avctx); return AVERROR(ENOMEM); } @@ -204,7 +203,6 @@ FF_ENABLE_DEPRECATION_WARNINGS AV_INPUT_BUFFER_PADDING_SIZE); if (!c->slice_buffer[i]) { av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer 1.\n"); - utvideo_encode_close(avctx); return AVERROR(ENOMEM); } } @@ -701,5 +699,5 @@ AVCodec ff_utvideo_encoder = { AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };