From patchwork Sun Aug 1 21:15:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29178 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1050083ioh; Sun, 1 Aug 2021 14:15:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjHm66mBUF/jvGymxdWS+9uYwPtjrQ90lMaCyueJ4PvycJse6BSCCmVSXaGB1MNcBoaTQG X-Received: by 2002:a05:6402:11c6:: with SMTP id j6mr581715edw.349.1627852554647; Sun, 01 Aug 2021 14:15:54 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p31si10404657edb.554.2021.08.01.14.15.54; Sun, 01 Aug 2021 14:15:54 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=DH58dVrA; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9ADB668A6E1; Mon, 2 Aug 2021 00:15:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2039.outbound.protection.outlook.com [40.92.90.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1779968A62A for ; Mon, 2 Aug 2021 00:15:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fTTj0G9fO8wMoTFPk3ds9K5hQwS/h0zcJqeIbVrT5yaDa2Q1/Q1duNHCDouclVhuSvCeq+YKaKfuC468/DndnvyqGz/dH8e3o0gtObei3+32M6MSDNYMkY50U8bxaa2ExVAO8eJR3wV/oUd0xVX1BrKLntRrcX9oM8Lj2fhRhH2vILIIGStne7vyFVpByf6xbWrkGg4gn3sbrdhd+jC5pw7J0Hh9rdFKIH+wVFzACi+LfHP4JTZQHFUHMD2lVJfFHLL1PZuYuoB3Ot22kHMCindGRXf9yKOTvQ84fgCGUEewZ3wRVvc25r0sNrtSmbHcom4Ln+/+ikTBE2qNPEvXYA== 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=e1/bJeRj943OYUuFjrp3GamgVup5P/f4MlE6GA/vLPg=; b=EbenXeBGgIxKj1QPy6Z0DQEMX0VDp19ytpgwXtXVYnjdcXUoBycDh1fRzjg1L2lGzI+Qt53L8zHnE3+RXgRA4HrsfPutmFXdrp4sy2GzqbwYw1LKyTsMwL4bmOBquBDILImlE5opnxLCeVdX2gPSdnSMq8BtfO4rnztlCO0PwgWamk04HG+2BLDoX4dtDhwBI2qJ1fW2+0C4+lrSDfNdmKUtXlIQisxR2mTVNfoZdJ7Qb/FZWCKcGUGW6m/CCjDTC6LHiJwbPbxmOP2muQqFT1LYZqs7X0XcGwAV8H75+3LOShvysp1iy+/74wwGrQYqBR5W195fCj/2XhWBOTjLSg== 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=e1/bJeRj943OYUuFjrp3GamgVup5P/f4MlE6GA/vLPg=; b=DH58dVrARP08DqLTpg6W4cnkADrqATNIu9Ht6lGomu+FXJrQRZx5lTc8/r6ENBuspcb8zc/QKwP+wZF9ghDUYUzdaQgqPwNczeGP6+nu8cCg5FoFghPZm7zLaJrmu2UI6GNE9H1Kgi4Zmc0bPe4ibeili2kKF5fZyyvQETZ0ihdHCcbs2+rDmKmvrboVKIYdHLjOQjlZV4lbY8FqRunl7YKw3VHA2Wld+ugV2NuFMyJp5S2CTxcvOP+QfVpJNFUO4xW29hv6sSRyX4PoGM068t3+FIl1DebfsSHP/Lhvuur7D4nd64JFv32cDCvOdtbtuobchzEueGQXDksYkEMm2Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7301.eurprd03.prod.outlook.com (2603:10a6:20b:2eb::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.21; Sun, 1 Aug 2021 21:15:43 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%8]) with mapi id 15.20.4373.026; Sun, 1 Aug 2021 21:15:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Aug 2021 23:15:29 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [8WeA4ceBY/nrduFJJhDeTB80NwckZGe6] X-ClientProxiedBy: AM4PR0902CA0022.eurprd09.prod.outlook.com (2603:10a6:200:9b::32) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210801211533.1005556-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM4PR0902CA0022.eurprd09.prod.outlook.com (2603:10a6:200:9b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Sun, 1 Aug 2021 21:15:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 57a47fd3-5d8c-4ca2-ef06-08d955318558 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRC6LfFJetu3tzwViwha8R8MJgyGo817t8Tk+YruLFGUapvXEkI1AZvzT/8b3kduqHSwTMy5euEbTg7muyhKNcC5nKgSCyjJhQ6FBH41N5NPr2fR0aY0N68AF77JcPGLi4d6DXY+FPk5VXGzNdTdDxMex2qQDJ2HBRSAPfhWMSp9z7XXcxcD+O5NxVObmNFH1W0891FutpuUbqWVNM148iRCtu1KUsQ4cxTuqGxqbTFOlBqAkPSmeNNWbvwH2VNPnek3k9ZrW8DpqWcr+MjroJjUZOiCw7x7F1QM6G5E7cSThLLNJMF7jEYg3JXhIaNJnH3w20u3Jdvoacqjhao7ejmmpwdMJL2713s3x2o86i8ym4MTl6OnP0MibDNTaP93A+mE35/WBiBzaBb5ktFfnJCIX4xvkO79qYqTyBR9LRb7QEb9aF030PpWOST0T3mV2oIXdrqX8g4YjzvzdAu6mKKrA4ArKr3x6tvHMnsYUJ7qT2WjEYeGOa3xzcawx0fwnSQZnjEtab4zv6IaK7nuDPubbaXLoSzSA7KBZMB0uW03FVzSf/O1HgtFmkQ0dv6YpVQKsQ25x+FdMcfU8S2Ai3eRC2awo+rM05f9PFRfWRpJfan+tawVbKzRCR+6VT2j6J4TvzCis3t6t1AtJIJ2ycv7G6nrp6FZmw5JJHi9YuHpbPF3FaEAU/uGnKWTnveSX7eZBoB3aJ04TiclRGvdFAtPxnYEJ7qUBpAvEw3SuryQiq+Q5TiqFERcoRHGJAj3ik= X-MS-TrafficTypeDiagnostic: AS8PR03MB7301: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w2tPy863uXJgcL7gn/zcvrY4ZYPpxZ52Vc5ik1IPeTuqkajKZItNprl/UOdiHaCpPSlwr7GdaOF5ltLFjZ3xV8rq1PUG4KHzTv/WuvMD0esheOwKmBjzOYRWrpDTEhVzYvdAKQM4n5yAUVSpwU41fSqIX1yfl5KONb/8/r1/Ya7B4gkwniYWQvuPK/Hu8hs//eJrtHGhbIp+2C9o2aowB8gewfVFfY8L1KmcO1X08KHxsSIDhQD+xCrXNvRhkLgWRUhnoHQUBvW4xTgfxcB+WjYFow/qk+qGFM2kM0GVyCeOVT+7B5XVCF3J4QzG8+f+93izbjVsgcBUp4lZIevSoybTtY39OeFkgE+mXESTTavTfgYSFXIEEeR+loqTsWEz4Q/TNnR7UAyyH7EpbHseu1PPHD00mfMYHV/EylLjuKNTVsN4KvHS1eMBEiXOkfkI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5J+icMVepSeRKLr7i+6AI+Q67yjAYCMi0NfZnhGUOjQ9aQJ96H1C4P00B8GFFxnvz/ib5iTObqWQC9KjkM+NeKA41Dqq+v8Ukgo8StdT7sAD4+JQdQ5mdYP01Sx+4cFIgnsLl2ugQgOWj7LR7s9BOA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57a47fd3-5d8c-4ca2-ef06-08d955318558 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2021 21:15:43.0464 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7301 Subject: [FFmpeg-devel] [PATCH 2/6] avfilter/vf_paletteuse: Remove redundant freeing code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: WXfGECIpX8nx AVFilter.uninit is called automatically if init fails. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_paletteuse.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index f07ef5d760..4e90927322 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -1076,11 +1076,8 @@ static av_cold int init(AVFilterContext *ctx) s->last_in = av_frame_alloc(); s->last_out = av_frame_alloc(); - if (!s->last_in || !s->last_out) { - av_frame_free(&s->last_in); - av_frame_free(&s->last_out); + if (!s->last_in || !s->last_out) return AVERROR(ENOMEM); - } s->set_frame = set_frame_lut[s->color_search_method][s->dither];