From patchwork Thu Sep 17 00:08:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22450 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 C9CAD449222 for ; Thu, 17 Sep 2020 03:08:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B4D0668BAE2; Thu, 17 Sep 2020 03:08:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F38968BACE for ; Thu, 17 Sep 2020 03:08:41 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id x14so97003wrl.12 for ; Wed, 16 Sep 2020 17:08:41 -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=+xUCP/g2wMd3Z7yLGLC0sL6BpLm02Yn8X/HIy8F8Rcs=; b=RfTsG7XgtQItHir1aur8UgJwo+TETq8m6qeZW8JXH5bVr6FJTl6Clzd79yyHuOTeJ+ PJkgIbhm8U+bgZK27uLE+P/ZvOLhUXps17ZMBrZszpfUZG+V2EaUDU73AUKW/JwE22Rx 1wGeQ5X9VdAF2In7Jro0QI3w072hIP5YDDRl4qx+WrFvjL0WDGUxr/HIJgfdTA8OOmEY dAdg6ZjIvXS2pff2B54M87dsI6p2TZFlTNc2jx8BMg+Dq91wZ+PQxB0WwNpzk4lG+6vh MOcFcYqqeA+zSgfj0fvAZ9fzt+sDFOSMnrH/FUvGa6+kgf8uLJhs/CzF+IyAc2Zs/ofe P97w== 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=+xUCP/g2wMd3Z7yLGLC0sL6BpLm02Yn8X/HIy8F8Rcs=; b=fXl6psS2W5hulARK3b67mecyHtiYJXQcQTcDGl7Lky+smpxgFB3A9rprWpAzHMq+dr //gSJkkrvn9Wx214sMrH481WnUlOSem79KcKTYuZi99HTDhH2QT1+A8aO3od51sgMwlQ WG3QWU2HuWD6ZuUPLKpy3IVRx2IB5YMh0vM2d3KoBQq0NrqjkFWo4u0/oz9BBREjZVDX 1NE9DGQtMigXU3Z8oveUGJwT4+HQT31CTo1fSkXDOnt1AsXNfP0FxW52/tZAvOfPbqsO M+cXMoRrQDGm9H8d/obRowAerILNXliWpo8I7yYJDXtdUIS7JAjqv9jzQMG5Citnh0LC LHIA== X-Gm-Message-State: AOAM533DmPudC42mDsXbj9iJGpIVd+ekPgNMN9V8x3wLpxSB9Tw9hMbG PmXsIlHAD2nJzK1Gz81Yksijimy9MPg= X-Google-Smtp-Source: ABdhPJxNlC5DAyj4PB3r/ymZRSF8wPmsyaU5xxr2YVWDGDcKXzjnBVGE/ek06dyGGl/nEpcp6C4dXg== X-Received: by 2002:adf:ab46:: with SMTP id r6mr27194758wrc.360.1600301320243; Wed, 16 Sep 2020 17:08:40 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id m18sm7941327wmg.32.2020.09.16.17.08.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 17:08:39 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Sep 2020 02:08:17 +0200 Message-Id: <20200917000816.497453-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917000816.497453-1-andreas.rheinhardt@gmail.com> References: <20200917000816.497453-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] avcodec/av1dec: Remove redundant second free 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" The AV1 decoder has the FF_CODEC_CAP_INIT_CLEANUP flag set and yet the decoder's close function is called manually on some error paths. This is unnecessary and has been removed in this commit. Signed-off-by: Andreas Rheinhardt --- Unchanged since last time. libavcodec/av1dec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 871db76b4d..cb46801202 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -480,7 +480,6 @@ static av_cold int av1_decode_init(AVCodecContext *avctx) for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++) { s->ref[i].tf.f = av_frame_alloc(); if (!s->ref[i].tf.f) { - av1_decode_free(avctx); av_log(avctx, AV_LOG_ERROR, "Failed to allocate reference frame buffer %d.\n", i); return AVERROR(ENOMEM); @@ -489,7 +488,6 @@ static av_cold int av1_decode_init(AVCodecContext *avctx) s->cur_frame.tf.f = av_frame_alloc(); if (!s->cur_frame.tf.f) { - av1_decode_free(avctx); av_log(avctx, AV_LOG_ERROR, "Failed to allocate current frame buffer.\n"); return AVERROR(ENOMEM); @@ -504,7 +502,7 @@ static av_cold int av1_decode_init(AVCodecContext *avctx) avctx->extradata_size); if (ret < 0) { av_log(avctx, AV_LOG_WARNING, "Failed to read extradata.\n"); - goto end; + return ret; } seq = ((CodedBitstreamAV1Context *)(s->cbc->priv_data))->sequence_header;