From patchwork Tue Feb 8 12:17:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34178 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp750607iov; Tue, 8 Feb 2022 04:18:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwIBLPuIuG5Gn3xHeBG1zv4JHJlHiz7mgcLoanYNlqu7u1tZcUAsQxpB2JwdjEmwjimi/2g X-Received: by 2002:a17:906:794c:: with SMTP id l12mr3651060ejo.116.1644322691389; Tue, 08 Feb 2022 04:18:11 -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 eq20si2731695edb.47.2022.02.08.04.18.08; Tue, 08 Feb 2022 04:18:11 -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=k7nbaTSv; 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 517A268A5C0; Tue, 8 Feb 2022 14:18:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073070.outbound.protection.outlook.com [40.92.73.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C791368A5C0 for ; Tue, 8 Feb 2022 14:17:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OMsQ4X7BzWY38QdN6GsucdahpmlaPXO3YaSbOcj4VtXRR9ftUmtIltAzI5m5o+Bq2V/gz8F5bGwc3Zn6i2dJgY/LaOb0wA3sO1VhIyjNmyQiLtZMAcmo1/Lmkafj/YPHrgzFJoqgXNQIu1MkfnRnIBQYxuZp373NUGAqXOlnBkArfI7/3GoysI6ojUwbB7nXhXN/F8nrXW1MGaVCaP6pniadTKDVGnALUfRCKbpSdndEAMNfiC+UlE6JRnnsUIuBdCLm7wXdFjnizCmI4r0k4a1vWcHpU7jpUHSq6shPxFYQ062hoq2Tgs5pO4oqDG4kZMwVsqKuqfnw57x2Cti82w== 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=LBD+9KE8SvJ41cseCTGZnfJE6SJstd1591xSHt/XUU4zHxlCqm7pHKzTQy9w2YMUKNrMLO6LPA4HsKN30nuWY6t0PUvt/RUDHJuKGKtGSOVEwRkTniKtITacUgNziPgNbdfVvQjMoCTj8OEca011d//uKYomsHgGOK9vfi+QR/TlYFxwQoP3tEWoLKfEJgSfx7v1DRAI91gbMfr3x7Ec8dUc2uuYpURXfavqpfJUKuRUmpiQCxW6GfHTdzQshyiUHJAs7dwdRuMtieRKsVWI6maRBjE20yLpISTOqEV+hXgNs0dO33849bkawE1Bvafjzj29IG6+X8mr6jrzrwAraw== 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=k7nbaTSvUEyflVx49T7BCh+e24wTc3iHYEz7UUVXRda14w8JroRST9kNDAVGmbcfg9OJILDSwVZdujfePJdif3phgP+Htd3/ZVS1HQ+XacLOxqqoQEgbTE40eBee0Pq+P/pl/G7U9OsA0sxQ5S2f1eIWCP4lMXX8s4+2Br0yFyGEIgXI+eRKZZA6KLb7P6iKa8P+Xrg5mf+ywfNlnwiL8i7Ig97ttTj3J0gIRDB+Ml5jMz4WmXeCctAPANzBAur9b8QQl9Sk/AIylHC9M5z5dkIy13T+mGV8jc/DyHSwSNetGjUVVjVDW14ZP37/Sk7/h9H7x396+M6QO/BS8fd0rQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR0301MB2255.eurprd03.prod.outlook.com (2603:10a6:800:28::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Tue, 8 Feb 2022 12:17:54 +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 12:17:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 13:17:46 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [c4pYGpRTsVolcxtld3r/UJiN1gXrOYwL] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220208121746.1086613-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 217cae85-7550-49bf-2317-08d9eafd08c1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQlB9bKabCTlQohqaUcoxYjTJWMzjH6gTr8gn1XI5MTcfLxtGLBhUZfdEh1TCOLEVwGBit8uVcDBft6kGsB2+EAGP0IDtJMAxa3dxEtclTbo/z4KPhQq8AcKErJvs8DkdpmZAc6MZ9cvcQFumG5or/LjCy3pIu8IhmSFHR7/wWvJ+eQsrT5tZPnQLqiryTCxJLoXsbGXmxylBo/701y2EzS4wWhYj8jYe9n36jzb44/bzEekvLrt1CUUAFVUx8pjqzTzAMoe9ubiO/xRcmFOi9VU8F0cVQsAsJT06A2uSQYv5wThCiXWVvf7gvWCjPu/dHBCaTQyP0jopiDeuKE/o/low39LI/U3EON3wRfUB9xa0Wv7++Z33iU+RR7kdgyPtoySW4FqVXYdQPgeOtd0TIAu7r/A5uoKtbSYvf6gSmyznTrN0TUEMxCVoKQW3IgJGyAJzcjljiq41Wh5L+yqS5j+LTPCwmREWlgsPaPe5X64x30olKhGD2EVs+UeCwf8ibkyry+T/oMNQtXDFLNiB92AIxVOStl9n6oioqfONMJebt5UewJqX4ZpDU+efSzEgSSSnDsQrpcxIlEAXrh7l9D39IvJN5QWusEFcr6CHeiyxqVqQKArE0FNCdkB6JcyO3Xu15GPuq/2LmIbMwPFMaqpY7LgpAI2DVzMbQRyAh5oUCW9iJxBwpPELtHHPqhzvHifkQT5WWs0Zsq8TvBoXRboQeZhTH2LzHN9OisZPQrGx46d01FM84MXe+EP0njXIo= X-MS-TrafficTypeDiagnostic: VI1PR0301MB2255:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6vLgCo5VgCcpzQb+JA/SC/OLsgvFXxoVQ/KmnkgWi0XZzAyHQU8Cq6rXtHVesDYKm5x3unimn7d59MsjBVKL6hgzVtn7/B2zbNNCMNyDgafpE3hAZgYMahXJYq81o1UJTIHqUtcZWvlwkaMBYZBRSNoU0gtLrRmC7CDd0EW9497Q5BhLQ7aFqAWN/5k6kaRPMs1py/2JSAAlmPE1SyrD+3xNWCiTHPGaKHSHVrmT22ZWZgl/lsiqvbSC2grGadAjKnPMnu7mK/YPaxPZKrHVk2XE2SzkO4GlIN1LRH1ASw30Rj3mbzVpJ7xqf4RWri2WpzHaD2pAnjcYuu9OeYqKj38lsY3YTMKPyP36L/r4Qk82y9yvuMymWxG4+eYpRh5nRZB9Vmg/Tul+xuB2rV7qNctizhGloM1d648Q2lLkMiO/oYmWaqu/xCDsSrCgqXHxRZgItrotVgivqHjoj5kj4I2g8iy9OIGQjLUb2PJT4XWBjvzrjSFnirB32osB55EvnT9jXVH+dZjFSg7C+s5c+qpkYLZwoGYUUyTHZBn6g3k99IEuadFOfiR8y7675NNcIUh3rViJk2TbxpzayAIKwQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OQl82XqrDrL4zm0T75sgRrwuAgx2oQskMVwiJsGPbQbuP5VnjgDSBwFe8VqzyIpK04tPgQECuh5N8vMPrfBO9T8zLMqk6+l5MGKyvm+NPwWS9yuShE7sNtG3iBdlFDNu8w60kk7nasHxDqE+L9Tac7tMfcRZJf/ifFwa1UaatFvagk3qQLTJ/cRmyY1bjv+G+Xh4JCfxND18481SUXt6yOwV9JOQKSFL9T9NvgDjB3rjWOavRQsbISoo2bLDNs+0jNKZiMR9zfYPb0zwMEDCqK5rv6GEFNxStzEVam0DOYMaEFqPfpmzw5tZpJ/sF4AVgWrvcSbcvcaFe+2RXnUplgNaNevpdEHp1N1FfrjOhDizjce0mff0YQHQfYW8aO9N4AzmD2zjXyKHaTInPYvgCpg8O39ELJnSGHskqY2fyBtBt9kdZYPAuGeverI9y5XnsFjxL3ckA0N/MoHEKpwW8s4z/d6cmJ2ixeq+OZHGZ2etLYcO5zPaDsHTTGeAt4PPMGjtteMsLjaM56urg2gFkcK3exeWmjLR/Lw3JEigg6axPjKT22Dmx90UfVv+4z87FhvIoEseJBQIw3PJ7OlWCOLhh7wd9ZH9P9/czNwVLl4eI0+l4VRpnbg6y6t372zpJoBnhAvwdN4RmMpcK5US2pcuF1TbSHwfyGf4i6HO4UIW/2btU6Yoq6JmvSRCKU0a08g05H2Oha0LkAMy8T07h5K5bcWhkoK9keu1PnbpZ6yeSKa/5/eWZkOZRCRp/1IokmjJ/sdE2dCF5QbqXuy5IHgch4E3O19r5j+1ZRpQ0sKtAwP28AQbysHo701wQOWwMTAvCpasshKSa7uL2iLL1pR6c7EcZA0gew5zSmHWoGAd3BHN4LvDgH/Tb0XD/lzu3mlQyrBlBuWciJR22N22R2ZCB2ks6WYWihdu1gxiVb+LwsgsRb+YionUUHaPSmH9kQm3isxAbguLDsJZEH/gmQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 217cae85-7550-49bf-2317-08d9eafd08c1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 12:17:54.7104 (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: VI1PR0301MB2255 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: 6FKjGPq07K+i 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, };