From patchwork Thu Apr 15 16:37:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26929 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 2251844AD78 for ; Thu, 15 Apr 2021 19:38:01 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E55DD68A13C; Thu, 15 Apr 2021 19:38:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066089.outbound.protection.outlook.com [40.92.66.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F9E2689F16 for ; Thu, 15 Apr 2021 19:37:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mHk3lEsrfI+lISClWbBpQi4l3wkhnpj4UxOeHFDfdztiVsA4lub0XfTWIrrK0su/zhcCiD2GtaSdmCK0t9yIiNUdc5kHyfprjdqH+aRsVJMUJa7gXABxTGHJPwwnvpHFsnrn9wHB5Tp1nvkarajo/gwzySHx2x7Q8opInyncIEqTLBRRYEEkRnnmCoBLF2TEb3LVYOYJxuawjkitQFb6FQB5dvGB8segpcBlfWEv5JgqDC9skwSfJOxIBpljd6Je3oPa5dLMfrR83zxO0Xgtik3R5aEQM/3zVJLTWG2BIkMZsuYrwq+Oir1yh8GMMvOcOFHI7ILN5Plgug+3qjWHzw== 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=XVivWEOWJna7p7Obw2DbtMGhbkblLJzXEKVz1W8aJWo=; b=JG0DQuMxnkTfiI8H9SGSp6Sczo8qbcJYFqJaCHJGcTeYdWjd769vLOSvbub/wRMTTwCaeSwHMo6icbKNZatJQRmP+BeGJKW8JiGRjuX9UDC3ESuezEsnpaAns18NMGYDhr1Fx7xZglt4uJUkiyEqwjVvV71xf7jcMF5r4lvtGpu2qk826ASUpBUImMB+E9V6AjZtDW9PfTC55ms0vYMProbg+V5W2gxFpZo+pErRY38l6wx0LZNtefWLYAUSzPvzbKNCC6zlAX40y2OsmPKGKdQ+/fqK+LXIkdlhMByKnKrTyVpM8Nj7JuxVI685Qv26gQZGhU2lAwt8E9DpTJ3TXA== 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=XVivWEOWJna7p7Obw2DbtMGhbkblLJzXEKVz1W8aJWo=; b=Dr6vpOPyc2vkqnBIANpCkgdUH//UrW6rEu2pFUw3DLKc4gLB6Gt6Q9qih7wYJoQRZNMI3TWgIEzVWODXNReajHuoqtmzwcwE11lTKpkfClgKMtPNdWsj4BaTKLORKpc75NZEA80pSzz9OI14fTiWHmKMdN620lm675+UYBmPFu08cvri1h5F72sSdWGOFSAEXTwHiABk+YWQO7Y/ooFxsm0pSr76ZSQV8Bn7a0TtNhqy3zm53k4PifwSTWGzD4GPOBJoX2/zwk126Uk/YkPQYT5jIulDSqWJobYdHqb/01LTE0E8QKpVQk+JiYakVR8NqOepQQ7TmqTs6yNgebuD5w== Received: from VE1EUR01FT043.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e19::42) by VE1EUR01HT027.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e19::313) 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 16:37:53 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e19::50) by VE1EUR01FT043.mail.protection.outlook.com (2a01:111:e400:7e19::407) 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 16:37:53 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:8EF49513648CE08F217E621157289A8E348A9DF5F92F6DFE8177EB2D0E0F9D55; UpperCasedChecksum:F1404FC4F7F754C06AEA617AD14264862A1C797C1A7E812251CAB17A8EF16F45; SizeAsReceived:7368; Count:46 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 16:37:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 18:37:45 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [JUQn3bamgwjg3TQUO/ojw98bh7A6uWe7] X-ClientProxiedBy: AM0PR02CA0022.eurprd02.prod.outlook.com (2603:10a6:208:3e::35) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415163745.1580589-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR02CA0022.eurprd02.prod.outlook.com (2603:10a6:208:3e::35) 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 16:37:52 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 2ded415a-193f-4790-70be-08d9002cd073 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJdrXeZji9BcwfnmnPWeQJUhyIxC2/aTazzo9yKAOAXynAjWMza9OQIRh1hRobVH4F5pzluE9MQt8gEQzZLP2LCqxuscV/NZ6cNvWXSSSCFuO6O0udd3fKcPPmkHr573aiT+dkAMvHslYsUHpu5a/ePL5KBQQAd6n3IaAwHKrkNcnB/pakkOOg3nOgThZm93XJOyFFkwzrAaqp8LB3XO/7gJW9zmGH/vEAFE/qUjWEJTdeyNuCgAZ8+eSrPbfEUU/5Aq1GwsFSizf5SzI0hXtJ1mMjvSW4zLUkf2can6nT2BE1QoSiiszHRtrW9KVEXcU5KHtHgwSFeP5KZkV42yx4O+2TbMnGJqK6kBTrwQX1q3ittNIRvuA81NhepuwNm2fZ4NAV7vPfqbrVKpNx3eJbF9Ng5o5SqlDpANr8Hn8hFkqud7i+WLyvCLOR6seW/pLwZlOlcJ0ERwiXk6kaqH/ubGqVkvP6AQdoZcoaIGwl90P/4dBpBEEJtwc4VB0rxa21odFJQRJoOUDkEx18SssaR+WJUE8ArH6BPoeujb09DckIywm4FrOtIFUL2K5Dh7CBwP3p6rXLYi+AV62hTowZK02ZC+vwBpBHLnigDWTPm1v03fg80QYbDTMXw5HEXlcug0qvJCGUZxmd1/k2/nGRgeVvZCmfY3A1ncO6yQ0DrwI9FFcRheCnTpPR3Ut6liAh/4oAW4Y8l0w== X-MS-TrafficTypeDiagnostic: VE1EUR01HT027: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MWJCZ8K8R2PCoYHHkVkDYWDOEHVrtlR6BQwNbJzK+pL5U0by/351/Rrci9twZb0Y6387KgfKZlEbv7I7thYlND8n5hJDcp+Z0UnhVwLOVF1wzcI3+MO79lVic/kdTiMu+cLL96sueBo+JareSlNIvRfRv3rAppHPHxXXfBaoxsawexPyQSgInkBCiTLCq4lhZp7I2PNZHGM7vKzRKiK1wKnG39BoiOIkrtk46LuSIDK36DxYlstT1ohCDXRakkVtHtnUWLZikyjTTixdWj5ibH/nzvsaXCXYHzpYIx9LxmtQOMY0+HLZ9FYN8wZLU+ja9rHueDxO0IKYFNkD8IP74+gdMR1sUqgL23BBAEj6y52DLUhJ4rcyifP0rEth3T1DwgBW2yHJNZ086h2XY/hGuA== X-MS-Exchange-AntiSpam-MessageData: LalPiLVVc7ZSUnFpMUhlIbMjCVzqKvfwCpeMH4+BCrCGT8EvbKoksMq+YLeykc0zfcNas822V2wRjVM1yT0LQAoC/epYcPRwCYYHhneJWA48+ipmPDsGTepIbE/xtUtDO0aqXlSNZTx8TlLUEGO3oQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ded415a-193f-4790-70be-08d9002cd073 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 16:37:52.8941 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT043.eop-EUR01.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: VE1EUR01HT027 Subject: [FFmpeg-devel] [PATCH] avcodec/ivi: Fix indentation 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" Also improve readability by keeping a pointer to the IVIBandDesc that is currently freed. Signed-off-by: Andreas Rheinhardt --- libavcodec/ivi.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c index a5074e9980..cefaf77bfd 100644 --- a/libavcodec/ivi.c +++ b/libavcodec/ivi.c @@ -268,18 +268,20 @@ static av_cold void ivi_free_buffers(IVIPlaneDesc *planes) int p, b, t; for (p = 0; p < 3; p++) { - if (planes[p].bands) - for (b = 0; b < planes[p].num_bands; b++) { - av_freep(&planes[p].bands[b].bufs[0]); - av_freep(&planes[p].bands[b].bufs[1]); - av_freep(&planes[p].bands[b].bufs[2]); - av_freep(&planes[p].bands[b].bufs[3]); - - if (planes[p].bands[b].blk_vlc.cust_tab.table) - ff_free_vlc(&planes[p].bands[b].blk_vlc.cust_tab); - for (t = 0; t < planes[p].bands[b].num_tiles; t++) - av_freep(&planes[p].bands[b].tiles[t].mbs); - av_freep(&planes[p].bands[b].tiles); + if (planes[p].bands) { + for (b = 0; b < planes[p].num_bands; b++) { + IVIBandDesc *band = &planes[p].bands[b]; + av_freep(&band->bufs[0]); + av_freep(&band->bufs[1]); + av_freep(&band->bufs[2]); + av_freep(&band->bufs[3]); + + if (band->blk_vlc.cust_tab.table) + ff_free_vlc(&band->blk_vlc.cust_tab); + for (t = 0; t < band->num_tiles; t++) + av_freep(&band->tiles[t].mbs); + av_freep(&band->tiles); + } } av_freep(&planes[p].bands); planes[p].num_bands = 0;