From patchwork Mon Sep 14 05:27:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22364 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 41425448249 for ; Mon, 14 Sep 2020 08:35:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24FF168BC41; Mon, 14 Sep 2020 08:35:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E97268BC40 for ; Mon, 14 Sep 2020 08:35:03 +0300 (EEST) Received: by mail-lf1-f65.google.com with SMTP id z17so11969513lfi.12 for ; Sun, 13 Sep 2020 22:35:03 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=TZ+nImZuWX5ZzkK5rY3Q+TyykOO3dUZe3Q4gXO/g8oc=; b=B5oGUKl4XBAnaiCKG4U2kVviD5bLmsiYWejXxN3N0ZWrNIA0dIpXpBwbBVVgdeU7R7 SvzAapjN1H/8kNMtWx2MvE3qXPjDOOVFRAITwKCrRWHIZ5Wd1OsVdoC+P0z1Vuo1LYht GiX6dk5MOAKeY7NQ75EtTTgvHLzkdUKfUTqY68MnO+3yle0xG8oTmTf744N9A9AZfghQ Y7zmzMm7LOv/tjYvIv2N3f2CAHTAuxtrEpSDpSbaH0pvFQtiaNjkovYy3QJlREGMjTqA kDiIZvT7nOHXQdRMNEj6lLNh6cYgULNC/2VpLvSVt4oKh10g5OACU42plcrc/K7l42nh 4c6w== 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:mime-version:content-transfer-encoding; bh=TZ+nImZuWX5ZzkK5rY3Q+TyykOO3dUZe3Q4gXO/g8oc=; b=uA2D/+cA7/eEXGGg99jwEXZFiQf5kP5BXaAMCLh0s94vb3P54ikkNAgj3LU5W/ZVFn ClLa3YXkcOFuWQvexQo7NDgW6eEp2LMpMsB0HAcmsUwg071ycUl9pEDfD3qzh0Txkt4V X8UDbIhdq2cxiHjt8B+NUfAbaGPoGbdxZ1/gHsPfPDYyQ9e88DskDn49TyB4sbtSOT2m tRMWJtklNU7Pxy/9T8/HGjbdl6RLt2dIxoGRKcwsUrorItDUh2PYIEb7cKiC5D3ufxsB IqVFzIlDaM7E9zoI5mDXjzsfAGQ6V18/IDDz/MWELE7pU8xGfujdAjSeO8zoURUjpCx0 xwAA== X-Gm-Message-State: AOAM532Osdg4J4WQc3nlulSHNzyiepPrMn4AwQStFKJnPNXuwvk6SveF ++fCK7ImZyJSOLj6fY6aGvRAigZvsTk= X-Google-Smtp-Source: ABdhPJyEnkuW4f+VAnvCxJZe6qbW8bddafSTBVquJuHZGtJViwC9dcIynj9F6aGjzPmdiZflHvZZSg== X-Received: by 2002:aa7:dcd9:: with SMTP id w25mr14768676edu.280.1600061311436; Sun, 13 Sep 2020 22:28:31 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id f4sm8251421edm.76.2020.09.13.22.28.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Sep 2020 22:28:30 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Sep 2020 07:27:40 +0200 Message-Id: <20200914052747.124118-17-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> References: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 33/40] avcodec/dxa: Cleanup generically after 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/dxa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index f6edc03e1a..3f62eac252 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -343,7 +343,6 @@ static av_cold int decode_init(AVCodecContext *avctx) c->dsize = avctx->width * avctx->height * 2; c->decomp_buf = av_malloc(c->dsize + DECOMP_BUF_PADDING); if (!c->decomp_buf) { - av_frame_free(&c->prev); av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n"); return AVERROR(ENOMEM); } @@ -371,4 +370,5 @@ AVCodec ff_dxa_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };