From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7CD7C40F60 for ; Fri, 11 Feb 2022 09:22:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE1E268B1F5; Fri, 11 Feb 2022 11:22:19 +0200 (EET) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068030.outbound.protection.outlook.com [40.92.68.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E57168AEC9 for ; Fri, 11 Feb 2022 11:22:13 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ggBXZ6Sojmsmnp68TMMTZtW0qAxGCmJBNR4NGmJwB/OgnK884rFHBnPEIGFwqcX/nXdDHH1lBlmawse740zQ6dfWMo+N1m8RTv7ZSZMw+eNpgN/j7ZieTtPXH7ZD9gN+/GwM2drMa9bXzRTfp9BdmoZQuEd+EOI8WtZj2KSna8uJ1ogq3MmzMSSdG/HumH4Hy2ntM4w6mnITCDjTkUQdWg4q1sTWat5S6SzYBbVjcbQSv2L5AkSSIt8GUEU9TB2qEjKzLunsNZIj6eoAU+GRbivyiu4QhG6Btn172ofIHefX9bzF/6szf5NUkEnKAAUuE55cb+IgUo5qHLDtinJg6g== 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=vg7ylSF/hybSNF1LWBYoN/enVTZo16259Y2XfhBYlu8=; b=D2vq/dOhLIunHoheCx5lJRRSRXXQG+ergSDUPSbPheJpW2KKvPSKScqYMt2hhNpcDvrUAVKHPLDv5R8pND0kNZYNJ88YdsvdHX2KxMAHfBWkR9CKBYLBDasNEmYfDcDulp140S1NJLyicojX0smH9OssezMs0JBbx0K6l7UkmJnvZdKawCExJrK3B0U/8M8kj2OYgXq+DxDcTwQ2ho6wBFTXp+odfff3hI1LhqNMoulFZW2DVUvZOXvy7v3a52MyOM/UBUbVQZ6gfFGZrVuJLVje/nITZEixgdhiVv1ceHd/1m/zWLeK1VPYFHbE1EgWIYrdk1JSuzG6J+E95rmXDQ== 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=vg7ylSF/hybSNF1LWBYoN/enVTZo16259Y2XfhBYlu8=; b=PduB0s7QCGgg5wPxycwQ3jGaazjGu1WDX+8Zk68j7bOAUOBAbSteX9648OZcuj/7o8aBNvJMMf5baJ0eVkL2Z6scuYw33FCIYlQNwZq2Ifza9Q5QmxHOGYi7k+nHX9h98eQiHnkiIcdx1+QsUTXOVnTJaIyb6m2OfiJG1cPoixbQNzDe2KbP1rfJZOWrxIPGraHO48or6TB1DWVqGqNGeMy9pTKeFEW/4VzyckMMkz4kH5qom7ce4iXXXJ1aEF81XY7e9cz8arWR5+gbtOdQZ2bYSZsRoIB/LAJ83kYhc/mIa+nudLHI5/O3dmZp2AMrtmjf7GfOjADoeGISyWV+2A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB4752.eurprd03.prod.outlook.com (2603:10a6:803:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Fri, 11 Feb 2022 09:22:11 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.011; Fri, 11 Feb 2022 09:22:11 +0000 Message-ID: Date: Fri, 11 Feb 2022 10:22:10 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [ZuwKjcb3Jd/4BkszUy+QtqV9DaTQMkQ+] X-ClientProxiedBy: AS9PR05CA0051.eurprd05.prod.outlook.com (2603:10a6:20b:489::8) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <3e9a22e2-77c8-665f-4460-ce1e1e50a31e@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e26b204f-0050-413e-95fe-08d9ed3ffbb1 X-MS-TrafficTypeDiagnostic: VI1PR03MB4752:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3U+kt1Tu8AUyMRrzAVC28TLnd+HXLEGpZUv8NigRlzobbWQ2mBX0b5rYY4f5WlnJBwa543ay5i2fOb7+sGo3uRUFg4E0uZGKz1p0NxFALgpy7zl3flGRe2b82wh8/wjIqAWsoau0xh9T66GnGsdKXqMWueMu8/YRXhW5XrzaJkXHAIok7YScbsGNKpyoFeTTooKYO16U38vrDEnHLt42gpSy2ZVMehdSQLzJLWl+jPHVxfOFpJQiIJVCqCKrlrvRpYgGEC9jd9X2IeQ+JviyWgZFZodLmTP9jWDn6cdGw0xdLzlro45jbJAzjV6Iyywp/S47miiAV6FGELGk2wNBfAAHhOwiCt/AN7O2sXLVk3sihWGzzV2l1zqRgrXmeZ2VkdR7Iij+8uReD76g6hK0TYve9dB05i133bbCEjvNw70SqMuKhchlIc0HphygpOEXp1eV7HVXtX2mLXkNCFN46AfO+iwsSi4wZSKHcrWxji7XyIdUmfBu9LQY9U1ErainuUDERoO11r4ENdpI8K4LFV3kRan6hpbkEOrKzbRTMXaDdEsVpvTCVMagYXgPzTVClu+fkidNv/5oxcMWcWHZzg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b0M3aXJIam91SDRYWlRvS1ZuRjI4M0hrUlJMQ1dHZHBjOWhyWEZ1RDhNR1ZW?= =?utf-8?B?dGNhT1VHOFFabXRheDY3bG9Ud1F1ZHE0VTgydG5DSHdWalcxRzVGTCtybXJ6?= =?utf-8?B?K2YxUUx2WDVLMWZxOEN6dkdmT21KVFBLdUNYM2k4RW1GVWJpTTlyWUd1TE5B?= =?utf-8?B?UmtNQmxpK0NqaTE1a1NCZDI5ZVBPQitTWVZ5blNpdktxT1FwQlhSZ2IvZjQz?= =?utf-8?B?RVVmS2RKMmViRWJ1UFpNa0hNa1FhVk9yVW15R0JQRGg3cTNyTC9EMVJqeDRD?= =?utf-8?B?d3pGOGhWMGZST0FZWGN4cVcwa3hqbFk1ZENKcW5LbHgzUytNOWR6SFVXY3c0?= =?utf-8?B?bFBaaFl6K3BXTXQ4cnp1RjV4RXl2ZHpzRlp1ZjBoaG5YQkdRY0Nob1Z1UU9i?= =?utf-8?B?bmxrOUk4cm5KWFlNSGtOK1k1TFh6RGFPRDl4S1JJelN6bFZFNmhyZ3ladnNy?= =?utf-8?B?LzNlcDYxT21Wd0pJMlNyeHE5T2VhZ1EwMTZYOFlVYmdQbnI2ZVFZdTZOWnlC?= =?utf-8?B?Tzl2RWpyUEZjRE15b3ovdk5yaEZYSzFzUUZHdUJWTVlQYmVjcS9Ia3hyZnhT?= =?utf-8?B?YzI0S2xnUjdyU2trV3g1K1VFR25tTEN6dU10WmJXU1M2RVkwZWlYaWxDUFFT?= =?utf-8?B?Y2xIb1p4M1dqcEkydzUyanh3RGNTanVqWVFicS9pR3d2QkRsTU8rYlNZK1dQ?= =?utf-8?B?bEpUaFF4ZG5sVmt2NTFWQTEzL1BHQzdrb2w0Qm50aTY0VmF0MVQ0anBOTzFK?= =?utf-8?B?YitFRUVqOUdtUEFHbkhVSCt5L0M4dTY1bjhpSE9VNHZwcFdoc0VDZWNBOUdJ?= =?utf-8?B?ZENreDhRUE4vR1V1cllZYWFyU0FyY1V2OFl6RVI4WVcybjFtZmFYSUZidWhP?= =?utf-8?B?VVg0Kyt4ekU2NGdDcDlvcDhBdWFFZzArcWFYc0p1QVVmb3lGZno4NG1WRTN0?= =?utf-8?B?VkVpeXM5UTBLdzNJRnI0eEIwN1JrN25TaUpsRDBKZjFvRjdaZDdiZTBSa3dM?= =?utf-8?B?MFNoTmwzb0ZOangzckhlakNoT0FnQmdnZURnR1JLNm1GRFFFZUtMZVNSbFQ0?= =?utf-8?B?SVpYSGxWYXhJMkhGZEFOWGhUV0R5MWxjcVJqQlc3V05oOEdXQmppRy8wOE1U?= =?utf-8?B?UldBYXBqVHIrMHUvQitheXM5ZVh0a042YzlMYWNlanMyOHJPOS9HYWM0UFlX?= =?utf-8?B?Zy9CZ2NlWEQvMnBIRE1rRytWK0dFQTNxWG5rVkJCQ3M2VzQ4U01tMGhjaEZM?= =?utf-8?B?T0hieHB4QlFEMm02aHdwUXNJSTAwbFpPa1NUcXdtNTV2REEwQT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e26b204f-0050-413e-95fe-08d9ed3ffbb1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 09:22:11.2640 (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: VI1PR03MB4752 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > 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, > }; Will apply this tonight unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".