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 ED96540F68 for ; Fri, 11 Feb 2022 09:24:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4695F68B256; Fri, 11 Feb 2022 11:24:29 +0200 (EET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2039.outbound.protection.outlook.com [40.92.89.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A932468A77A for ; Fri, 11 Feb 2022 11:24:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ezHuv1dq2g/e/8FwPeyvFcdGNPIxHUZk+gCQvOY10gU9seL1ZaTVfhK0tAXF1HKlOPVlZFnjDXvBt2YnKgs57JKT/z5YgG/9YpfhdnMIqEl/DisbMZyP3Xu1UPYUrFbnK6F6NssZQo7bnpXuQIhldDg0BusG1n2GJPWBR3ZwFZYdJuyg/Yq998At9ASRyPhvbThxugzGPblnNoDnv9zZqkEMVkoUzMgzwB/UqXg58SK8uL95o8qAa9VPV05wI6A8SkjzCuC3/n/M9JXM/Gys0gxNqpi8YrMs1k8T1IG6Z3ORqgorW6yAkPQt5Vx42lIzrOJlyDEStZsPZz3xmjKkoA== 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=JRYwA6YNibrWSyO+zMlxlGZbt88wFSMSIcmtM0hmH14=; b=KUxUbfYI39NSP+KfPk8LkHtBnnEnFisedHxe4c+wZB6vRg2NiavdiJl3U93qNVRKUBFf6SjzOLJ/30CDUCvTVYMlb08Bh7oi95xsvhLip+bZACfTfuLujz9oToXlfePTEr3p++0EF6jVKzSb02v+BFFT3Y6jCWg9LhzT4rRPJEBy5ZMKi5WoyffzzLjj+cqvqqi/6Wk93Jt+LtgP3x/nwP++vrYeRqiPchjDgsC4pMeknxKdTngtQUXAiCc7Eniewi9FkAOLj4Bl/I+SCzAGF2RrABo7R+DM9RTNzqSJc0VP9RKtYv8QW5UDErtkuOb1NJ84XPGDzjIICdaLZ2EVJg== 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=JRYwA6YNibrWSyO+zMlxlGZbt88wFSMSIcmtM0hmH14=; b=Ate/IUkmsm8+iaqjl2X3LWIElsuQGIvB7hrmuAzwR/ilmLaeeXA/dxReJLAJqybqO2ZINBMkvtM6I/AjUTNVVOma3tLhvoz/67YuOKM/bkXixz72ScgYb9OV2FN/MVsGzBgallz4ed9hwNYEO3utEepZoLwNHC83DkTTSRU94jwYK99OGtPbcA3S64FvOgzYnJZnbAqq+shWGmOr1kHAEWHdH6RkeqfwKnd7YyG+Zn7hTWuSxsomAVVsCimuXmvnAnsOYfbBm4blCoVfscbfFRtOam1fu7clXVziEoQHmQmU9VDsxZozdPynnJxoCAnHOzqWaoB479Rd+uP7+EfHQA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4312.eurprd03.prod.outlook.com (2603:10a6:20b:2::19) 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:24:21 +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:24:21 +0000 Message-ID: Date: Fri, 11 Feb 2022 10:24:18 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [jYSLiW9Z+oM3gKtsdL6FP8FDpZ+mmjcR] X-ClientProxiedBy: AM5PR04CA0006.eurprd04.prod.outlook.com (2603:10a6:206:1::19) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <34056eb2-4825-651f-49ce-202e5af5d4ed@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9de80d4b-1090-403d-a713-08d9ed404856 X-MS-TrafficTypeDiagnostic: AM6PR03MB4312:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tZwLa2b9RoSlkW0uOjKRVx/y3rUKgm0SCq/mgkPorp5HS47KOCb/EUavuJpswVXaVw3qKeSTjLy1BL27+U+TtCQBe/kgL+wGNKmaDqovaqW72+JdM03lZqVhhHia1BPx6NhWTQodldysrJHTO8YTWmPFwdMYh2m5csX6qi/iWwbkK1TZfzm5vNBz/xQmJo/amvIw4wOrJSgMwoD77sEBU06v3hQoWzX2/7dH+scK+rILQebDb3dALi5x9OQwecmPeop62GMOZWudfA8CUgdC0znfT2nuI4nO4ekL43tjPmLt0BWYGf34Vgu5QQK2uEnQvSX4jciyZWJadyvQVYs58+LTBGwSaVSDEZpNnmwN8Pqa92QaPC7XyuvIR0BE3w9jaMmgKYWSY9eDaexCQuVdVUfQ5IUQQpMZ2WuWp1uzUWHcGrHZuLDHHO/+F0gHygicE32o7JowrnXWX5lVkRDg4NMIMQwNRZBjxXEErc8qoZaghqVno89fwqiCZKqBkZ/vrmuDJHxO2t91Z8+JzFYmboxCTKyKccgCzpAYg2p5KMN1ZulHaBN6bZOJio+vY1VVVdAyQz5C657PLrAa9kw90A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZjdQOG82WmU0aXh5Rkg3VjV2TFFDTFE0TzNjMDYvWnhRQXZ5aEZmazhBaTZ2?= =?utf-8?B?RjVTU0duenlkaFJqUXJjOGE5cFNvTnVrd3lReVhwRlJHeFQzRkpqQWtCNEhk?= =?utf-8?B?aUNvQW1maXBvK2xaSkpIVWN4bXpLN2hqNm1tV0Q4ZEsvd1RKaXl5ZWRnUGVj?= =?utf-8?B?U1d5SCtkcTFvR2RYUmRWZTlYa2VjaXpHd1lhQkVZTnVqaDJ4T0dOdGRIclYz?= =?utf-8?B?cTV2UGh0WjQ2WU9ZNkRrMGhtd3dUZ3hqNVl1VUw1QUFhRzhTUURmWE9zOWo5?= =?utf-8?B?ZGZMT2hNWjE2NmQybTYrdVhXTzBIOENKaHN1ZC9aOTgwWFRWZDJDMDBXbFlP?= =?utf-8?B?VWlDamp6NElJSllLVGI5QWZtYXVEa2VTemk0QTlLNTh5QkRsM2xLN21FaEhK?= =?utf-8?B?aytFOUVrVjlzTTd4VmNmbDBoUytmcHIrMFYvOTRBR2phbEtkMkRTZDlKd1Vv?= =?utf-8?B?RHJwUXYyOGRRUGg0SU9hWDVidHNTS25HVE5qcHUxV3VRMXZRaThXY28vRExz?= =?utf-8?B?ZHhMc29NbXJLR25FV2dwWCthRXl3N1BZRGQwdDhTeGVUelN2dUtJTnptWHlk?= =?utf-8?B?Yjk5Mldoazc2bDJjQS9Ed0p6NENBNWVOWjlKU3E1RDUxbXk5R0xHNWdxeFBh?= =?utf-8?B?V2VIMS9oWFVlQ2VVUUdGakRKNmgyaDZTaUJOc1ErdWdPYVl3bDdMd2VwL1hH?= =?utf-8?B?RW1COFB6Rzd3SU52SzNHUGpPclh0Wlcrb1psTUIvT3F6dXVzVjh0U3BsRjlR?= =?utf-8?B?YWdxbVZCVFlSQmw5UFpGM1dpSDRjRWUxbnZRais0Ry83elJaK0hSeVUvTWZl?= =?utf-8?B?aEEzanN6QU9CMDhCd2g5UXUzUi9BdGtRbDIzZ2pIREVsZGdUUHk2OFd6VXFM?= =?utf-8?B?ajJRdnBXTWpTejZLN2RES2g5SUpSbGF2MFhWNlMvYS9VNWpxbGRranpmbVVm?= =?utf-8?B?eWFtbG9sOVhXUlhLenROV3FaZFdDYTQ1RS9oSTRmWFlDekl2TnFIM2dacnp0?= =?utf-8?B?K2hwQkhBb3lnaHVoZ2t4V3F1R01LZEIraHFUSDUyZHJNZUdQZkcyU3V3MXZI?= =?utf-8?B?bi9WanpZVkJjVWdUT0lXKzhFTGtXd21wYXo2d3hnQ1Z3U2lnM0xrd0RkWW02?= =?utf-8?B?V1dKbUJNSzBCeUZUTGdabDJyVGVUWFA5N3Z3aHhWRmVQK2YxY1VhbFVYRk1V?= =?utf-8?B?aVBuNmgzZlJ5NzdMU05XUGhiSU96N2hvN3VFYzU4ZERmL3dUU3l5WFVVSndw?= =?utf-8?B?cklTRDRoM21rMmJwSlZYSkxvSmJ6YUFlUE90K3A5UzhCSmVZZz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9de80d4b-1090-403d-a713-08d9ed404856 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:24:20.3681 (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: AM6PR03MB4312 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/ralf: 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/ralf.c | 26 +++++++------------------- > 1 file changed, 7 insertions(+), 19 deletions(-) > > diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c > index bb80119b0c..0c51f49939 100644 > --- a/libavcodec/ralf.c > +++ b/libavcodec/ralf.c > @@ -163,47 +163,35 @@ static av_cold int decode_init(AVCodecContext *avctx) > for (i = 0; i < 3; i++) { > ret = init_ralf_vlc(&ctx->sets[i].filter_params, filter_param_def[i], > FILTERPARAM_ELEMENTS); > - if (ret < 0) { > - decode_close(avctx); > + if (ret < 0) > return ret; > - } > ret = init_ralf_vlc(&ctx->sets[i].bias, bias_def[i], BIAS_ELEMENTS); > - if (ret < 0) { > - decode_close(avctx); > + if (ret < 0) > return ret; > - } > ret = init_ralf_vlc(&ctx->sets[i].coding_mode, coding_mode_def[i], > CODING_MODE_ELEMENTS); > - if (ret < 0) { > - decode_close(avctx); > + if (ret < 0) > return ret; > - } > for (j = 0; j < 10; j++) { > for (k = 0; k < 11; k++) { > ret = init_ralf_vlc(&ctx->sets[i].filter_coeffs[j][k], > filter_coeffs_def[i][j][k], > FILTER_COEFFS_ELEMENTS); > - if (ret < 0) { > - decode_close(avctx); > + if (ret < 0) > return ret; > - } > } > } > for (j = 0; j < 15; j++) { > ret = init_ralf_vlc(&ctx->sets[i].short_codes[j], > short_codes_def[i][j], SHORT_CODES_ELEMENTS); > - if (ret < 0) { > - decode_close(avctx); > + if (ret < 0) > return ret; > - } > } > for (j = 0; j < 125; j++) { > ret = init_ralf_vlc(&ctx->sets[i].long_codes[j], > long_codes_def[i][j], LONG_CODES_ELEMENTS); > - if (ret < 0) { > - decode_close(avctx); > + if (ret < 0) > return ret; > - } > } > } > > @@ -539,5 +527,5 @@ const AVCodec ff_ralf_decoder = { > AV_CODEC_CAP_DR1, > .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, > AV_SAMPLE_FMT_NONE }, > - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, > + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, > }; Will apply this 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".