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 DB06440F6B for ; Fri, 11 Feb 2022 09:28:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D273868B2A3; Fri, 11 Feb 2022 11:28:41 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2025.outbound.protection.outlook.com [40.92.91.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 712A968B29A for ; Fri, 11 Feb 2022 11:28:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kCcsZ/oyJPnQKaXre/9IXYTdujp3lZlGd+FEobTQbG3x7fx/5Ow9LWCql2AK4r/pOmA+lfcOoenM50pxqc1OZd/Bb5LJIGz9b+f9OYe+kdvQ8Lw9KBPxKnNm2jPUtdp2lykJTaltpfXxazWMGuKZtL76wO01E4q4+00jD0PJkmDPvMYo8HKcQpg2lamYOwiAhHctrxzS3gy/JTimNbKuHiYqKhV2MEs1CYtxOq9DeD5xtyCisGbXJsvumE4XBIDW4VaJcNtUrDwgzCA8/301/rfyTXMYB+8F6wYOX1gkw6MhQgs2upRN/u9Jt9Y1XciX2Qur2bjD22km3vUmbu3hFQ== 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=HyvMrweyJgJMQE+W7XB7cAcsGvosXCtPLNdqIyccm/Q=; b=X/gbelnbduJ6lxb2zdJk9BLGSm2tT9Ctyjrn9x4VG2BrCTKO8hZGrEGFTEuInKHg/JMBGqdncf4zWtl0ExFIEsmUm9b2VisEiMQ2dEgOqbPqYiSd9Dg5WiDWn+xgBvIbPXckWxOYOWmA/9fFlUDPPz5WeEchK26h1Bnbd0vjJArpGg9wFJXUbSWLXkV59/98mkXph2Sfo88HihcVr0PjnibvUrSW15hMvZ8Cn4yb/Rsb15wMD5D+Dxe9m8Rr60/93nKKgLjaSdHMLVE9f8SGcu6APh+aNWRZAIQcaXHAwi/Fnvvp7Xl/k62lFFxoooRKAqLMPA4IrXLDyBp3WWT2BA== 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=HyvMrweyJgJMQE+W7XB7cAcsGvosXCtPLNdqIyccm/Q=; b=pAQrApk/aAqfWNd+/v+gk+nJKa65STcJWKfHtiZ2Yj8Z9FoBEnTFw1H6onRUrFZuyaSfRihgohNlcAEB4jFGKolDRpTaRIyXQIrDNlKNW7+OQE9DZpEiYx0dc2HKzpBh6qnVMlfrA++UVk+ykov4C3+sQp3OPUB1PD5clb0k2k7LyRGGMGQK3w0kururW0o9cqrCItNktvZFVUkoN5kFiDjnqwUJgnBeCLQoxIPVNlfyspHqeAaUZX/RuDTOIw1jVzTSP5U1XD2wjj6xrjN/7kjT+BSpZ+x3qMXrbZGjy0ju2N65fwZngStcsCauOFxOkUguFZnMoNctIi+FkNz+rw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB4559.eurprd03.prod.outlook.com (2603:10a6:803:52::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Fri, 11 Feb 2022 09:28:34 +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:28:34 +0000 Message-ID: Date: Fri, 11 Feb 2022 10:28:33 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [z8kYNupipDjJ/TNhJq7/GrSek4zOaphA] X-ClientProxiedBy: AS8PR04CA0017.eurprd04.prod.outlook.com (2603:10a6:20b:310::22) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f75ce0d2-af7a-49f4-3552-08d9ed40dfd6 X-MS-TrafficTypeDiagnostic: VI1PR03MB4559:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4dwf9bzpV0DPoMnsM1O9UUmI9bBmxFk81YnWHKw9GJTD+4cZyArdPYM0sXjpIOGmdisctu9nihOExXF4+mOj8rBMzm9OgEsnBW9jHv9mbAjDy2FpL71bHpi+pE367I2JKfkaxuXzlIuMRgchPbA8W+gjumL09ons4RBJ3Vz0Lh/nr8BZNPcm3cxDtGsQyyIUCyfokrKghxZWM28ohYF32MN9hTQszRu8OKMLYRmZpPOcVNF6SXonEIkYcNDat8/C+RvoWAYXd4TPrhMmeslpwG8VV8IwVq7IilUG69U45ppXfm/7W0USl67824qa4xe6E+I2eJ9HfFeJ3SpkNYkhYXtBVMHSZJS6HxFoJ1IlZsUPNoKFiQZTuMyRy3McXSTkKwZIQPKyAjn17w5v/C5PhH36BQrfNOdFBhYGKDSqSQWECywVwjBLL4Mm3nGPdBKLBWqg72WFHp7ictrabmDIGAJ+YQ9mjRVefy5GaSvB0i6s+Bv9PDosKbAvc9wcdFrqRKks7q6S2IJKtDXQkwd5BD3jIFApeQVrcNh9yHTDivyJi1acvCGBAbc+/z+U7WzGLyRnnLeOr/2WyjWPRncPoA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VWFLVWM4UU5CWVVLQ3pwbE04ZWI5OTlISGp1UmlNdmVqaE5kaVRNV0h4UUwz?= =?utf-8?B?dzJrU2IwdDZmZ010WFVzd1YwbncrSDN4NElLdDREMmV1cnBhVFcyelhwemI0?= =?utf-8?B?TzhzRTk4TmpyMldtSklrd1RWRzNWUEZKVEx1KytuUXFYbkhzZDRwNGFCdThs?= =?utf-8?B?OEdKY0VsNlhKb3U2NVZOcWw2b1A3eTFaTmVraGMxWDBja0xMRlBEYklweHhQ?= =?utf-8?B?RGowQ2ZkMTdGeWdFWGlqZ1Y0N2R4SE9ob01OZjl6amlWeEc2a0cwOWttN2k3?= =?utf-8?B?KzJsNDhuZW1NWEk3TklEOEQwVjNtT050UXZDRlhvdUtKUlQ0VHlsdjRGYk5T?= =?utf-8?B?RDNzL0dsbkpqdTJHT3ZzV05PakFhQVNaWEdFVHpuMGFET2lqbnRDNjU3Yzhq?= =?utf-8?B?UTlEMGU4ZmljR21BdGtrWStuWWlJV2ZQcHpoYUE4djk4ZnZmRFdZdG4vamM1?= =?utf-8?B?S1pjRDdmTFVXZnJQQUJLUi9xUG9OSGdPVXlTSE0rZ2RKaU1UblNScjhaOVln?= =?utf-8?B?NGwyRFRCc1FLRnhWeGtOeU5JQks0dkJrQ1B0djN6empQMDZaRWZsVEorMDhG?= =?utf-8?B?UjNiQ2dVTnhZRXZiWnZycEl4bVdBK3N5RW9CRHd5NFE0K1diYnJTU25nNmlR?= =?utf-8?B?L0tTUGFiZXJOTm5yVWJXSFdOUGMyamZUbjRYMElQbEhzaUhaL1lGQVpIbDNa?= =?utf-8?B?SXR4RHlrVE9xSFFaL0lENnJ4TXpxc2padGVsRUVYaGdsa1RUZUhOT3lkU3ln?= =?utf-8?B?VXR0SnhyN3RCYWxJNEVrclE0THpzZkd5aURuUTlWYzdMcnpuQzg3NUNhc08z?= =?utf-8?B?UUlsd3FKRENFUjlEbnBzU013OENTTWlZUmNzdnpMYmlrVC95TitoL2NqcDVE?= =?utf-8?B?dnpNZEYwWS9zbHRMR3NMeDdZUmlKUGtYaXh3bWhxVE92NFVBbmhRN016REZV?= =?utf-8?B?K1dNbFIyZThRRkZURHFZUTlzOERDTzcwNDY1ZW5haS9mS2FCdHlwNUYxZTF1?= =?utf-8?B?dk4vUEJYTmxuUmViMEtjV2VkZmpZWjhsdi9RVFRuZWw0UDlQRVo1YjcwR2Qv?= =?utf-8?B?SUdpajNYYWNjZzIvT1NVeXVSczNmZXhtRjZ0NXRTb2M5cFNHSnAxK0JOU0xZ?= =?utf-8?B?VGc0M3FEMjdVTmZzL0tzS1VXRUk1T3pJb0hyY25BNGZJNk9BN3VCWVBOYUxu?= =?utf-8?B?aDFqZTZ0ci9WbE9hTDd3WDJqYXZKd2o5VUM5cCtVRmJPVkZRanlOb0JUQXl2?= =?utf-8?B?bzVocm1HTEdNQUJtWE93Q2tVUEpQcWdzR3p3eFVzTGVDL0VSQT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f75ce0d2-af7a-49f4-3552-08d9ed40dfd6 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:28:34.0245 (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: VI1PR03MB4559 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/proresenc_kostya: Cleanup generically after 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/proresenc_kostya.c | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) > > diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c > index 85651fce2a..08a874dd4e 100644 > --- a/libavcodec/proresenc_kostya.c > +++ b/libavcodec/proresenc_kostya.c > @@ -1274,25 +1274,19 @@ static av_cold int encode_init(AVCodecContext *avctx) > } > > ctx->slice_q = av_malloc(ctx->slices_per_picture * sizeof(*ctx->slice_q)); > - if (!ctx->slice_q) { > - encode_close(avctx); > + if (!ctx->slice_q) > return AVERROR(ENOMEM); > - } > > ctx->tdata = av_mallocz(avctx->thread_count * sizeof(*ctx->tdata)); > - if (!ctx->tdata) { > - encode_close(avctx); > + if (!ctx->tdata) > return AVERROR(ENOMEM); > - } > > for (j = 0; j < avctx->thread_count; j++) { > ctx->tdata[j].nodes = av_malloc((ctx->slices_width + 1) > * TRELLIS_WIDTH > * sizeof(*ctx->tdata->nodes)); > - if (!ctx->tdata[j].nodes) { > - encode_close(avctx); > + if (!ctx->tdata[j].nodes) > return AVERROR(ENOMEM); > - } > for (i = min_quant; i < max_quant + 2; i++) { > ctx->tdata[j].nodes[i].prev_node = -1; > ctx->tdata[j].nodes[i].bits = 0; > @@ -1415,5 +1409,5 @@ const AVCodec ff_prores_ks_encoder = { > }, > .priv_class = &proresenc_class, > .profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles), > - .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".