From patchwork Thu Apr 15 18:44:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26931 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 9D81E44BC63 for ; Thu, 15 Apr 2021 21:59:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7387E68A255; Thu, 15 Apr 2021 21:59:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2031.outbound.protection.outlook.com [40.92.16.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAF69688181 for ; Thu, 15 Apr 2021 21:59:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bzWZXb115p6Xz5XmjXK8ciFmdu5btAfGs3KtS3/CobA5dqQRJdLe0+1WXs2lg+4nb4WeaIdbY0NnKqbjqkT2S4a2foUV3GgaCddU6Ob6b+u7Bdc1v0Ywbo9520r3J3nqlHslUdhoOMjv9FFHgrXMvCsBa7k8HvLc88A51pL80GQbhh4yw6itPPKkNfSfPvuJ02CSfKxWeO427+RW8Wm3rxmgVoYqIvj/iw1Ae/82M9l7b41W5X3MxnLYdDQBp9jl4GmPvS88jGoCD/FWpQ+WrtHm+9hkSfwE6WK9ROwPEtJOfKJF/hEbykQYt/DTC9RRJ8kvmtJ7+bv0tAORntlorQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zf7XCfsDP88umeUW4slbCLp/pPvdpbKXQbHEDeq7JeE=; b=ODsd2qkwSvZKXLp4urAkqX7Fx9G/X2BPIcU1GAiQwCrOdlQPPNXaBUDxYabjSLonATZYP78KAzooa+csXfsZlgwG1VwbnLozmpiGXdOZxp4zRgNSL+REhxKQ1zdORXrNqi1aBW7OpzIVWKQeIHnHp2z5q1t+bGcMwZVeNejlDaW9AjmSI72EuYAZQLUlmydIQqNHYUV8dr2rz0MVZXMAnSSbOrMqrZC5TGGfHcdicO5ZigWt+AIk7/baL3JMGVImWeB1QAZcprAwdhtf7adssS2E2MRcQvePIlC92qXDNja4A9mYKT4bR3HPS4bqiiJUn19BqJHL51ek8sm0GQrLMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zf7XCfsDP88umeUW4slbCLp/pPvdpbKXQbHEDeq7JeE=; b=poynayYrh5CZ1CnWZlvXa3k9UJ4B9w3DXqjbzi33pACczFZ7ceGQcsEWiMbjJ4x/Ct9BIm9b6CtUOTxtZGQDLykvFqvxusrIZ9JWxroZTmPFeS4/b9SjSDV/hsjP4+J4sAwvVnkmiwvarCeBo/qMYQjgx4qeiul/uPlSfgvCD3qD/J/CqIbH0UzP7KAqUw8Ie691HEt5VqSpWtJNG/w4SjT4uYHLtOGNuP90PtbFSdPpK+Vsgvj4nWL9LZO57n8GwmJPXpBS1prc900sYuLTdYmx2QJvh1eHoKbgfQK4IlMFSkoJ5nc5ShlYmY+qw8tmeB0JN+ONUNgMfaqMEp1xiA== Received: from VI1EUR06FT004.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::44) by VI1EUR06HT148.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::489) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17; Thu, 15 Apr 2021 18:44:14 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc37::4f) by VI1EUR06FT004.mail.protection.outlook.com (2a01:111:e400:fc37::111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 18:44:14 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:2E09CE0013A82A935E8C108D4FD3CE4D876FA72E7F95172B9FC9C97DA436F1F9; UpperCasedChecksum:CC9A3E1C43B763C90484A0DAD383430114A7F1FD8BB4B0B948DDDA67A4C6E656; SizeAsReceived:7583; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Thu, 15 Apr 2021 18:44:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 20:44:04 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [L4Gq/ClgdPexWxU4h9yqUMUlwH4Bim7E] X-ClientProxiedBy: PR3P189CA0029.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::34) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415184404.1583472-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by PR3P189CA0029.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 18:44:13 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 86959f88-33a5-41cb-ae92-08d9003e776a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXFKoSKZyiLYcPwGDHzH9eVo1kUR4KoEzZ38NBTDj+Ocn+K9lgh8b1zHP2FuJ+a0TenQgV3o8f3NwmxD+9t/FK2ha1pCq7gxdBS5mi3S4taGSgbvi+iFZgDzIbp4H+OxdPWmKYDYWaOIw30QStp6LoBgFocIWlIrKp942cUg4fUyDOrhib7MW9+60N1bXuYHX/XNvh1MNs5GxKs9ZsWnJlFBRv964KoqDGo4VeZCNy/4K6SO4Nz9HuTsqGITkdF0vYU5O3p6UPDE9kne5qKFRqKrOzz4vrPHHM2JB5+rp1JUh/ZcEW0jwnZQ1OK1i+RkvvmKOKOd1fUEX+US4/h6gu+vMNxXFc0irNk9wbhs9m3hZfeb1hMpO2UeNUFlyjpXN/WmZKDx+Mqr4OdlW9meq7QTtLOeZfC7Wj5wK8ow1/Fc/+TmV6gc9vjLx/b6/3zbA6wWMDsaF+NKafhxi3FMh3hf8c9gMOXa2MNmze0rzNOtrUu6pIkhmvjO5/VSlpMnz/eyEXxdCzb7TOqzpTiScX4em9PvVlwXQo9I6Y3t8MPgMfu7QUKIf3q1H8fbepQFRdc/gPaSGfUcLcLUx2QF2awyhOX050Hifto/sk/G6FXboWIT1iBtjaFxbtVDYYQrAWEW/P/apaFmUklgxA4huHTxwGtvc/3JYk8IUiei8HZom8Af9zKq7tlzydN5H6PLrc002EMni9FGYj2Rc8+d7ucaaskN5xZPMY= X-MS-TrafficTypeDiagnostic: VI1EUR06HT148: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XUCdRD5BbTNCZ3XrO6MOPtf6MIFjwuR739H2j3vvltOk+KemJzYIMjLA0PVjdBIuivy88Z/rCI52kcg7blhzTwOuCwUjlWE5+X7QBYUTtPOGVv/jzML8r/7fG30k1kn4lE/Qltna8Si4dgSOyL7B8Mp8eAKH5AqQqWIcwuYrs4+CNktdrNzqGnVrbnoEKJkzOBYXFRs3u4M+EOLd1REX0N/QCTb5xxNYmoKIBEBvSSN1zVx03xz5RZSzj7oiVuvQ5JXfKq60a/KXIcQp0DaLyNzzZbs2ocI6vjsEk/AQ58u8F2laQRfe5nXFHSaWcOGIO1aF1a/on4PP+BbOAKxZHYjPSZ9cpEEeaR2lxMw5rsYFp1kQxZUUj5kguCjE8Y30GlRgTo7+KCyH0UC6+Vy6vw== X-MS-Exchange-AntiSpam-MessageData: 6RTjwbQP3AVrVERF/fQEfKnwDm0U4N7+m861GkENV819telh5ALEPjSVYqk10Hvm7DLZ/VJfXbhUDMfZIhTGIN6VRaAluPV06x7hSq7L7JtF1EsWt36aW3JV3QQrxKAnw1kdv5y3StKCVz44DUbbqQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86959f88-33a5-41cb-ae92-08d9003e776a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 18:44:14.3357 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR06FT004.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR06HT148 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/svq3: Free array of frames in a loop 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" Avoids code duplication Signed-off-by: Andreas Rheinhardt --- libavcodec/svq3.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 0d108da06f..396555b337 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1587,12 +1587,10 @@ static av_cold int svq3_decode_end(AVCodecContext *avctx) { SVQ3Context *s = avctx->priv_data; - free_picture(s->cur_pic); - free_picture(s->next_pic); - free_picture(s->last_pic); - av_frame_free(&s->cur_pic->f); - av_frame_free(&s->next_pic->f); - av_frame_free(&s->last_pic->f); + for (int i = 0; i < FF_ARRAY_ELEMS(s->frames); i++) { + free_picture(&s->frames[i]); + av_frame_free(&s->frames[i].f); + } av_freep(&s->slice_buf); av_freep(&s->intra4x4_pred_mode); av_freep(&s->edge_emu_buffer);