From patchwork Tue Feb 8 15:39:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34183 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp911525iov; Tue, 8 Feb 2022 07:39:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJxzNdINM48zUKFSDUpMSgGkHbfLFjJUfEkoadN4z884ot/Eb09eUFXH/rb5mBwQOF/yiulk X-Received: by 2002:a17:906:f156:: with SMTP id gw22mr4084630ejb.321.1644334775737; Tue, 08 Feb 2022 07:39:35 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sb10si3110021ejc.121.2022.02.08.07.39.35; Tue, 08 Feb 2022 07:39:35 -0800 (PST) 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=VwUrQ3dk; 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 50C4568B120; Tue, 8 Feb 2022 17:39:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069045.outbound.protection.outlook.com [40.92.69.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1744668A5CC for ; Tue, 8 Feb 2022 17:39:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nFcaw7qkeAEIYWdUWCOPhi9XLYD2o8qMCfXSUqim4Vba1Ko8JObKebGq9IPkPNeJt4RzK5wN8EQZ/LT1eSxMfR+DN92EOVsmhedTIltkavSK/qV+EyTQMA06GaQlZbM/mAqqjFQSaIIKf7q45p0AsrQvmAs0cNiTtOyUSBzaz/lMSM1wdngJGk8itCT80yMdZnB0Sw9ddpXPJ3fIlF//EkW3v0Ge4eKbrQ7GuEzfNUG4vobqtimFPsrgybWTa5X0wDv2YMYzKMqVzkRNN5zxuvOrPk9EZ4GU/kzgCEk4CCT2aeOwUIpq9Hac8mSxPh8XaKbSV7ENl2+LirmH2KrtiQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sF6QaLlK19mYW/qfAzHjnnv8i+RWMI2MULDvdcZrybQ=; b=Uwqr9KC7Be4kUiuHi68z9We1uk5zzFGq6WAg6H3Tprt6Hwd4WuBqKVo2gJ/DIKwCie801MzPZ+OzdgfSLDXfzDU3PmYPlrO1OOmb69Z11zZUByze6oscKW9F5mWCF16x8y+W2TkXEtRp5dcJNDX+3Zt+YVbu6YCVmH0xg0Lic6DqYz5LAkUq8FCmPcWF4nvLK0x3TFrhQVeI3g65F1wZtvHnjAH6wGOaYpc0vZyG8443FT1FT5yoruuY24RzuOpvpfsycQlR5SPB3TyayIIZPxVEsmkFEwLZdyZM+R7cZeqKASelhWQm5L8ff9VfKlJvQFRiHI1xeWUIhynABfwTlQ== 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=sF6QaLlK19mYW/qfAzHjnnv8i+RWMI2MULDvdcZrybQ=; b=VwUrQ3dkKHf4kFy3n+p5cRSpmZWnCgxwR9Q1kEIoCv74qoipKeBvPgUG0V+XVljmtM9cHwU+os/TLPdjmQMaJT4s39enfAKDBa4Lsp0EloRid1kgUR3d+2C/qLuQ08wN9J9S6EthGl4BzBK0sLw0QB51TDBsgKGF1SWTHWoM08M3fHs3WFXlZGMAVKBhbFNbIRABuOl1JOEMqMaqzzYlQG7uyXHV3OhJwzPNig45mAKOnLSP101l5ifTba1Uo54o4A8Aak0giCYGmbMhxfitRbrB5VHroLky6gmMDHJlT/DstvRdGpGC7t8oEAJJRjei5/L5N4MJxmSttFv5oRmnkA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB9PR03MB7552.eurprd03.prod.outlook.com (2603:10a6:10:2c1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Tue, 8 Feb 2022 15:39:24 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.019; Tue, 8 Feb 2022 15:39:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 16:39:15 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [zUei+2fBUdXciMm2KZimJPv4zzbtdmd6] X-ClientProxiedBy: AS9PR06CA0065.eurprd06.prod.outlook.com (2603:10a6:20b:464::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220208153915.1172492-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fbf9b050-f878-4712-c871-08d9eb192ef0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQlB9bKabCTlYh0pf6YrAz8g++7onHtOovJiayDman3JMdAN+qbQEAo/s0azvUGtDLdswDgl4L3zK4yoNF16SBhORbpOrIjX3/jZ4xzKpqeq+MJp/Ix3Si7vpd2v9xqfgbXQRvUk31ZzitM2CtvjQz+EkuPMVsPNxoGzrR0xzg1pAdG0WzAO4Gw3Ppqe1W9T63eamCOw27+jTfGZazVOoC5bsd4nRy4T2inhV20ED43hPk3cMbIBX150XwKgivNwguTp5E0V0tDgc3IJA4gj232WOZb0yVcojIu8SEZIL1Rq1z+SbkXlv+X/AuuuYKjpPcLcZRqzrdCvC4Q3WWhta02wpmCk/glMps33nW6sICgEjKGaiCuTD/diOb3XONdmUWxSadC3BbyJMKOZZ1gPUCpcCmaKp8zMTSLX51Wzwm+MIs0Max3nb3aHM7DVrqlnzxfhNek5zFW9rpOpRqAm7eoPbMgGpAPziL7q9KYMGo2rZzulqafZF4cF9hKBO7JelHUGNVtQj3kgC8eJCikQwgS1PVGzrq2IwZffZ7FadhQJKtkEMoO2sv50UXIRloWcr+mRuXABVt+bid39zj8Tsc6sYQaycwpn3qn9D4ook2qcZN8PKTd+NhCuxmYzUv6auN/+sY3P24NEgZUpFKyuYwWNcZF+fpsIxWis2ttt9l9l+DCjY6nNKz7La/mOJzb94RkBVVzSVD9oiFF9DGcYixBRASOuixf6uoQuTJQOitegpn8+2jPZZGj1N96I95cW3s= X-MS-TrafficTypeDiagnostic: DB9PR03MB7552:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kFukFPtRBU39/Ma5BL6NqAoZeHufdeDGqOTVM1EtnLYoGhkDlF9JOdlf+tYYZktvc9pXhzOwvz7vGSMY/VFP47kHJnZblVeqPfBz4LkUfGhVuF22qVRq8QfgRNCj2BRIf4oP487c0kK/ngshtamV5owGSCaH6662KcM06QXbYWIjkTDpFwOhrOEtg0sS3HLHJkUa3fQHhHWevD7+V6LuMAD4zs2pjrCsjGYG9q7H/7C5y2fKHA6wCWBK2kNGoe04q7xQ5gscOVOg83sgU6T/6x4jFjaWEz5NcGrfCYNe64afkMTa9uC9fl63WW/b803LDb8QfZgOkMnCxXGy7wLfRXS3VEeuSjjKWSn/+2ltrnt7HD6hAyR3IJTV25moeGQUQGrLS3KMhM2cQfWnuVKNzO2h4JsPIVFzIz+ktYyFW4F+w2VTIDpp4TQGTisCiBYLLjFzoT+I8HkmCyUzESCknQ+tXuNXXiVc0/Qn6lGeUoPgKPKKcWSbx3T8l8GpHnB8dS3VhwT97rArwre8MMUJ9Gdt5VjPOVvydgd+L+m9Agp9jKHlcZUoxMvLlf594XCT1XLB2sBB7E3gwxa6PzScuA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: swjlW5sFVR459Go75WYZ2MW47jGnBDM82qX5b7tjqtnRCzYsH876eq22pK4ajs28Z6VBq2R5xxHekQs7PnnMy60WbRh8rTnSsyGmLOBN3FTT1HjGXzzukHEzVBgilxvWHknxsxIV4rIPSrS/ff5+rNVmll8l4ZB5ocKXAd+uRkVIHiMoLva6WcpErtwtf0IK8fx9ngk++Shjl68DTzz3XEvSFBR8WVzOyIeSx8A2JTjtLyFT2kX+im9tnB++JrfMg7rZFgjkOXYHuegyF3EH0N172vFQtmRi/IySTwal/Un9mMDaVXjwF6eL7kvxXQYB/EQOcjsgQMit0SiljxTMwdWNDl5grjR0v2j+WteE5cpUWOt0aPKgrAO3qEQHB2EdJcVTN1FTk58wijNf8dc7ehv2IHLcu8cUiNJgszD8a0ovD6Ez8x3b+FBWkIB366DaWowIaFHD+7/b5dbVZDVryDRTA9Fod0za/yTDR0CwTFOVEWZuaS1VCeXSfF/wkx/Wxs83DBFOhvMhg/dwIdYbdH7nnLVDnQqqAL479RXY8WHa68SRJSj7XRt+WSg+lxrHHlYKDmFvwSPSyMZ/JLGkjoWaiVx61ncC85DbgvosJOMRy5SwO1UhpjVeFeN1Vmdjg06MSabD4ceEB+Q8yYExLO7wvPCr/IoSVVSOeiwdd0WBl0ktVLrbClZY6lVd3aRrgNRlknnonyb4L0lO5cbHwE/XZ5UN2QBdfg12uh2vwp0rbGDzctIWztQyvu8eHOAl/qtQMehoRbCSSaGFaGj3b6JNF+bfOedchaiMLwlB9AKkLlXeG0NQTHaZUywprKA/0WILGQqA78wJZNPVLd0+JCNk3NPl2vl7FOEaYxHmSNAvNwaYFq4eS5zHfl30UX2hmuR11DIvgM47oaxmPkKlwuzb9Z3KpeHYwth6EMwe/rtGZH1AnnRPyX4LKnoqE6XsIPQup3HI1Cag2xOTxQillw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbf9b050-f878-4712-c871-08d9eb192ef0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 15:39:24.6064 (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: DB9PR03MB7552 Subject: [FFmpeg-devel] [PATCH] avcodec/g2meet: Cleanup generically on init failure 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: XrdxjjKJxtLi Signed-off-by: Andreas Rheinhardt --- libavcodec/g2meet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 4c53838af5..8628016ef4 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -1592,7 +1592,6 @@ static av_cold int g2m_decode_init(AVCodecContext *avctx) if ((ret = jpg_init(avctx, &c->jc)) != 0) { av_log(avctx, AV_LOG_ERROR, "Cannot initialise VLCs\n"); - jpg_free_context(&c->jc); return AVERROR(ENOMEM); } @@ -1633,5 +1632,5 @@ const AVCodec ff_g2m_decoder = { .close = g2m_decode_end, .decode = g2m_decode_frame, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };