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 7FDE940F76 for ; Fri, 11 Feb 2022 09:29:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1961E68B1F5; Fri, 11 Feb 2022 11:29:24 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2103.outbound.protection.outlook.com [40.92.90.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C66368A8EE for ; Fri, 11 Feb 2022 11:29:17 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G0X9lz2T68NrQpO1VFmuB7nueF8b4Y37OphuO24wnRfeRy/7/q8kLEOo9PrsXtpj/lpsjDz8f7ERDQLkqZSvGSRvPvtEZ7gZ30+bv9rwXb5OYBO8WfqHOM9B/hHgRpXNHHIUof41v4xPfpL+IDFjObuDXJVm+hZoqay3YE/p2MpEVvDH1TeYbZ8nhyUDhcX+Ho2FMb5/ziQvaUGJFo9tyrOGJfZjtLBPGLOFkx13JG8NOFoNtk5oTUWpXlhTFKEBI5yaoUm62mKsXYrSF2owOqf16aNZNQl3+MBxx24tLrmSMRhWT0+9MYsevqxTAD13LQcRloVMW5RBegwNca9sMw== 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=RLpAbKxEMLTC0KE3LnOfnMmUc63FHe0J4dmI6YClqDk=; b=WoCmM6uYzca4t3lN/m6GmxnjpSB57E9cZHVb8gGOWV3BgWGOl0KE00j9vrCtGRZTZWKAb7MLRQqGtaqttqzzHx6LjTmcjTIVlbC9P72qC+l+qh7hCmM6SngArGvhuXpsTLOHS5FaCFWVqXjsk+NiaYCaeFAh4r3acZKzd0T2P3nQdjvj5ePCR3mpuIHRIOg66WjfsGVcag/DUcufXnM5AbVL0qyZgZNyDVjdhrjvD2DTSBNM7ZTRwT0Y0JKbIwF7oRvk839FnREi+nBUuovY4rlcMdIDCB/LTyCFKN4YO7GrPqkUYzB12le9Dh8PutSV8D9Ci6fTaOyBqZCfNHqV1w== 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=RLpAbKxEMLTC0KE3LnOfnMmUc63FHe0J4dmI6YClqDk=; b=UuNZh2IMz4+5y4p5iirgLNjtoOAV4F8TO370F0ccuy89Y+JmVo8290emtLf21Lfe9JgpIFYpSVOt4F+L9TPjjn8FFp7tal1UL9LyQcAH/SVAXG7oXOQXu1xbB09wy3wvbRYrmUjJ4cBaEZARbJ9xJxm0pa1YFuSaWAvxs+7xnMI4tkNqhUpwZFQ0DfcD75uFcpKP59ke0GLqMTE5byVw3HrQk3023cn/Il06dYY+9Z+d02bW2W0M60HtQRC/vjM22SSgETMUY4vtsl9UqPF/NxtKFU0+deu3+8Qf9oHNVIYcLRsF1FH3keD8IvID9cmNRLk499kdiRbBfJeYmMk9Iw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB6097.eurprd03.prod.outlook.com (2603:10a6:208:163::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Fri, 11 Feb 2022 09:29:16 +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:29:16 +0000 Message-ID: Date: Fri, 11 Feb 2022 10:29:10 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [1/uRXjo80udKa9LMbGJwlOcepQu4DCbM] X-ClientProxiedBy: AS8PR04CA0013.eurprd04.prod.outlook.com (2603:10a6:20b:310::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <7e70a152-00fc-7ce1-182e-54d529eb6328@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8434e3d4-ea70-4e57-8b39-08d9ed40f8d6 X-MS-TrafficTypeDiagnostic: AM0PR03MB6097:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X/o5jfhyU485W3x0u6iOierwXH2QGEENlk+82jlSZEI3j+xLg8/21lgZxLSJa7iZlj3A91M7SyrjE/pit8aQqQPwNUB1ZcIyrwWUTkYA2itIjc45U2iu9scIGPeoL0ypL0WvlIpjCcB8XNRZZqbHoIbIk/uK3A9zlUHic5JG5loPIgQ4bBs3xCoJDkUkuX1K1QRVOF7qNkH9Q88fQhPNJ/w4ZRi1v7F/uobCN1gRDEdVbpKdyd6tqo2EWD4R3bsH5hWTw+Ar2Ml+fGTtWf16Mdk7Y3MHnESpYswgPJobh45I9PFdpG7uukff5EEABET+XYY0dBX059tJL3HAqbpd55kJRAqFCuyPfbf7A/VYXYZ9umR7CFyohKDiupYVjaUf00pEVqT10U5kTy43anHCnbcXah8vUhP8FcGD+osk6b48vJPfF6Wjwo0nw53iEZgvUTinXWo2QmiILtCDcFb4Rr/LkQkbDa/X3nh8yXymVRXio5oM1ekrI6WSvoHGD2+MpvHRdzucKQyQkN7B6NLaV3RnzRwEfXTUl4ZNinJynR/j9Lvhd6EvyCUujotktX1C9mw9aOJFwl/sZGXAGMdpJA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cFBEWXB2bW5qOTkxcmdQc1lydFJ5dlJlbnNra3ZOWXptTVZ4Tll6UEJEUC8v?= =?utf-8?B?NSs0UnNGTzFtdlJTV0JBbVE5QnZMcE9CNS9YeFNhRlV1SkVmemNLT3hlMDc0?= =?utf-8?B?aGNqL3h0NE1kT1QvVFRYWHZ1cXRsREZROHJuclN0WlBHL2NzY3VRWTUzL1Fj?= =?utf-8?B?dUp0aEgxdlV0S0k2K3BZRWdUWE9JOWxBY1JJajdFZjZ4L3BFcldVMUtDQmt0?= =?utf-8?B?bThDREhzYm1JRVpxT0YzOVpIVUJVazJ3aFFNaS9SMkVNZFdQbTFoSm83Mm9X?= =?utf-8?B?amVyV0RLQlhyOHNZS0dBVjhpYk5SWm9Ddi9vVWdlTU43Ykh2VlhYRTdVMVYr?= =?utf-8?B?Ym9aUU1zQkJOQXVFYXVGNGd4U3B3WWJNZkpGaFk4NGhLZkdWcjNrVjliMjBI?= =?utf-8?B?cVRCN2NJZ3BxUFJzajRQcjI0M3VlNTBNeWVZYWhpMkUzNFNReks3R09xRGdZ?= =?utf-8?B?Ync4ckJaY2dGMTVNNG40aHFhSUxjbkxrV3FJYkVaYXEzWjhMSGxaUEhNa0NL?= =?utf-8?B?Mlh4ZkIzRlIrelc3a0Q2TDBHWDZLTlptR2JsMWVUMkkzNG81Q2JLYWs3TVVD?= =?utf-8?B?YkY4MHAxSXY2akQ5M2R0TTA5TlNjU3QzM3AwaG5ERkJiNzBxK1o2NjdWTXRE?= =?utf-8?B?N0taeEIvQklIOU1IbUxUbG1TMGx3UnVWa1JPaGYzNnJvdXNzeWVIWUpaMVJm?= =?utf-8?B?bWs5bjhZWmd2MjJoayt1Qk1VZXRScFZiaXF4aUdJNkxqNWdUZ1JueGNNTS82?= =?utf-8?B?cFkyWG9FY1VEMXg1a2g0UjFaM24ybkI5OTVyaitnRXZrT1lvbHlreklCT2VB?= =?utf-8?B?TkkrSThiR0VjWjEwdy95THUyRXJrU0NLNUVIKzREV1ZvYXR3NFBHZ094RzJo?= =?utf-8?B?Q2hHQjAyNng0QjhCOTRWby9hUXFYN040c21sVVdwbExTWEZLeUdpNVpLMHQ1?= =?utf-8?B?MXREWjhTeW1MWEZPUzZxR3NwUzJhY2NmckM5akVUTmYrcytWVjY3VVJtMEI1?= =?utf-8?B?OEdyQnRuRHpFa0ljUzNQNmJZRVRCY0k3TEtoVjljdUc5WENNRG5GTS9tM0JE?= =?utf-8?B?akNLckJENm16ZCt6bDJHdWhVM2dvbDllemtWbVoxMytRaXV3OXZsaGJlS1FV?= =?utf-8?B?eGJIcHBiNFFTczc1eUJvaFlYQXRodmMwek9oSzBlUllGWFEzM2t1ZVhOdmE4?= =?utf-8?B?eituZEF3c1RGK2lBQnRxejdYT3ozWW5GU2ZiYlJCN0JDQUxrdW1CRzcxMWpX?= =?utf-8?B?RG1tdy9HR2FJWEh5bTB5U3Ivd044ZUswR1VyaU9QN0hGSlU3Zz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8434e3d4-ea70-4e57-8b39-08d9ed40f8d6 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:29:15.9697 (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: AM0PR03MB6097 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/4xm: 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/4xm.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c > index cb315cd7e4..cb361772d2 100644 > --- a/libavcodec/4xm.c > +++ b/libavcodec/4xm.c > @@ -1008,10 +1008,8 @@ static av_cold int decode_init(AVCodecContext *avctx) > > f->frame_buffer = av_mallocz(avctx->width * avctx->height * 2); > f->last_frame_buffer = av_mallocz(avctx->width * avctx->height * 2); > - if (!f->frame_buffer || !f->last_frame_buffer) { > - decode_end(avctx); > + if (!f->frame_buffer || !f->last_frame_buffer) > return AVERROR(ENOMEM); > - } > > f->version = AV_RL32(avctx->extradata) >> 16; > ff_blockdsp_init(&f->bdsp, avctx); > @@ -1038,5 +1036,5 @@ const AVCodec ff_fourxm_decoder = { > .close = decode_end, > .decode = 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 patchset later 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".