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 5AC344AFBB for ; Thu, 30 May 2024 18:54:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 48C4C68D461; Thu, 30 May 2024 21:54:36 +0300 (EEST) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2015.outbound.protection.outlook.com [40.92.49.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1621F68D363 for ; Thu, 30 May 2024 21:54:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=evK/W8VpyzXFP3C7ypBql75wr0efOYiJGv2rKIh861H87ri4y2+kC2kQnfvItgV9BoSIel4ocZLgX8dw5PtPGxvxlUiyyrXA4tMm3o0OJOnuulSE8r42En7kmNryqg5XLFIcTYyEDtGXuNdQ40K//H0IggF+But9YdWyPR5U0G9Oy9CruD6bv5Dx3ZA0XaTjneLbX3o/u00Rzg8z/esI99ELT17CLz545xFiIz/PbNW0xcj98zk1XRT5oKk+NlaWlMPxYWyds32i6iXxXLeEc1iQfqdRsZc/l3jg8Tssd7yGMu3xNoSMD2rKHZXfDagh3GsyXTiqW/k3lhwXfslaqg== 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=Sof3XFIsT1VB+wJn+zZdyh9l2gtBgDp2IGRck79YTyU=; b=nJPPsi8qCrYw/DEL7OZcbnoINa+/OV6INKED8XPwNFwQ12cWLRlfaaf/jVDKUFBjp5/zHRAHAbwLHltt2cE/wKLKAlql3g+59pHlUEttI3AZfupHLKkqPQ/8kZaJt5ltREB9Ym42eAUmjKxHy1ImEoLon1ATOq/RZ5YZsp62htgsyFIa+xYfc8jM1+k4/FrTnd+Yfic4HqdkfX7o986rZ+pvxaz2IXGDxO8J7Oh48F1R1wU4/8tJVvrD6ijDk6o9R8RbwZI17yzkFjgkE9dtR5VJGPnaP3wUUBo+bzfmNaFvw/QIrRIiFVAYjO9BS6AWcEE6YxxI/eWT7ywqNBmECA== 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=Sof3XFIsT1VB+wJn+zZdyh9l2gtBgDp2IGRck79YTyU=; b=u2Ejghg0YVltmsJe0pQLd9Og45DhyZ2RWGUARaGAuMuZPY6CIvMPMsszf2WpUdbJKteBTkuR5yrd7HaPzw8m7E0y3gI+xA+c7HDjxfo3dwCM9cjHcniV3BOKdp+MCkhfRapaQqsjJvfS/n0whHd2k4QKM1TIXnhGR0N+uJzacTG17IAeXYA57cRqLqb5e9IKd7UDbUQ4cR846ROZfJNTNvBv+HaxvMgWGU4U8LMqvALsWLg/2QXmj1bRJS+nIlTBBd9hpH2Mp/0UuW3fifSr7qSBBigXCAS3qyS7Civ98cS0Q+zOGBP39jDGe+3jLBQFK7P/Se+xXVRy66GuOb8+Kw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0561.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:29c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.35; Thu, 30 May 2024 18:54:26 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Thu, 30 May 2024 18:54:26 +0000 Message-ID: Date: Thu, 30 May 2024 20:54:24 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [sBmumZXshTXeZfcuZU+W5fmb9+TW5a1i67+ni+3yjAA=] X-ClientProxiedBy: ZR0P278CA0214.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <85b8c4c3-b539-4b8d-9d7f-7e3a7a5cbd1b@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0561:EE_ X-MS-Office365-Filtering-Correlation-Id: f673c3b8-8a7c-42fd-0c73-08dc80d9ed7d X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|3412199016|440099019; X-Microsoft-Antispam-Message-Info: s8Xu5AVRPvrOSUm2RRRdJmlj2FmNt4EFxqAsYo8QEQOTDIuOT9BWPtmIYL89T6jnvr21g7Iqi1tuw6GBHwJXeswSKz34TFMMBfM8zHbgj4XQg4WGvgXFlXLqjxss1qe/2KdOGlIArlCAB6Cli2UyePMfyNfVp6kltBuoLx1mfZ6SeiCl4bSQqfj+606tscfriHKxmdBJQvjw0tPM+oMZb/lNh2H4M8soyDKqXeV7wA3sY+z7MXdRvtq5VLNVE5W9h1XITXnN511my8qu0MzwQNJwINyMfjKb2C2cPiIyIjwBXEW5Fs6p0Azer0ACtNSlKKIM9+IDnVTU1NClC6IBmUliDb8wbGcIaa2USoY0/rWPm/bikScJcKE8YKrfh8JFletjWR6BhWJ689nvqzcUK9cumWQEY824M3sr5yfUkjMOuzwLHDWsVceYAP/Yd1XspfrNmT0FmBJfxPRiPYAZfDy8UvhkUlCK7XghcWYik4L4ZKm6SSEiyfZk5XlTpr2F5KHN66mgOM8DSQ8yxjB10F1QGYzgV8AIxMBeShI5lE6ZgI1Ss1+IOdrWijAPwqWu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RENpb2ZKcjZhQUtSQnNSTUhzWStJb1ptYVVxVkpaeVVyTVRPY0ZsYmpOU1Fa?= =?utf-8?B?VHQyaG4yV3ViU2lUalYzUitXZDFaRzlxdkRMUmE5T1dzVVc3OW1uMVY4Rk5u?= =?utf-8?B?dTVUdmQxWnM5T0FzUlpITHpLeFBGbWRxMFRzZTZtdlpQdGdIMnZVN0tiWnd4?= =?utf-8?B?ZG4rZ2VOc2VVVHJiQkZ6UlIrL2h0QURRRFRKSytweGVHcVo0UVBMa1c4TjBj?= =?utf-8?B?cmJCanBnQzRUYkxUTDBsdzhnU2tHSFd2UUgxK282bWwwTXlsUWFjYlpyN0xH?= =?utf-8?B?Q0VNZVgrLzIzNDEvZXEvN0xYVDI3MVYrYUY4d3d3QUZ6WGgvMVUyYkVHTzZ1?= =?utf-8?B?b3pmU05DVzRBWGxjM2RFaTAyN1dramVYWW5OdkdRUytldG9DTk1VWmtNRnN1?= =?utf-8?B?Q3NKQnVSY0J6TFovbDNsdXRHbzdBN3RKdnJ4WjZCMWZmbGl1dTV1MVR3ZXo1?= =?utf-8?B?RzdvRzVIYmYrWllJUzVWK1RuR3Y0UlVpQkZ6MWt0STNCdE5MMS9xbUNNNDV2?= =?utf-8?B?K0kvaFI5M05ObEd0VTd6S01RSSsvenN4Vll3ZmE4UzEwaGxZdlhCN2pHbnAv?= =?utf-8?B?VjlabE1CcWg4aG5rYUY4UE9PV3hwNXpxZWl4SE9YTGtKVTNuRm1sNkVSUkZw?= =?utf-8?B?bVFwTDB6YlRHQTVFTTJvcnVia0VBL3hhamJxcC9qRHN3Wmw4OVFDRlIwR3A4?= =?utf-8?B?eVhGY0xzNktRNVd3ZWo0WGdPQU44SVlUQ2hJdDBwdXV4cWZ1UDlVMi81Vm9B?= =?utf-8?B?d1U1QnFUelBuUTF5ZmQ1dmx1d3JpdnpabGJQcWdPS0IyMVFkUm9pQ0ZhV0l0?= =?utf-8?B?Ny9zb1U4QUJ4c2k1K0s0a2kxbGVCNTVsN1BUaDlOeGk3NnpPK2dLQ0h6U29n?= =?utf-8?B?Z0xYRGcvclFlUGFPTHd4Y3l4djJqTlozbE1KekZqRHhyOURXV2daMnQ3OXp5?= =?utf-8?B?MlptNEdEZU01VERTUVVsN2RIbXlPeUxlTzNMSDVrZlZ4Q2RGS2xEZE1ZS25a?= =?utf-8?B?WExtbzd2Wko3ZDI0Nnk0V09hSDZvYkxZVnJBRm1KQ1VSdFZWMnNrOW11dENC?= =?utf-8?B?WUt0RUw0dkh4VFpiY1JnK3BXUmkrWkRwNVhFK0RlMWhNQm1BMDJ4NFByelhr?= =?utf-8?B?ZzlmVUdaclB5RFdoSEZWVVRlOEJZbVhvUUx1WG1OWGJnckhYald3S2FiQ0xG?= =?utf-8?B?c0VHUzRQdlJaK1Z3Q0xCUnJIMDh4MlVjenMrRFMxVzAzclBLMzlKSUVEaEhI?= =?utf-8?B?V2V3WEczeXhsdnlFdU5HY0JTYk84OStqNXk5V2pCcktGWkZvUDcvcElYeStD?= =?utf-8?B?ZDNCS2QwUVExN1hQVkF6akhESUNPdmI5dXRUb2hTVURhTm1raTlIcUttTlRv?= =?utf-8?B?bE9aUDV1MDJ0NThYR1JoWXFiSTRPQXhFc1dkL2lCRU5sODdrci9vdTE3R2Nz?= =?utf-8?B?MW0vcnEzaGpFdHdSTy9YRytROVVJSXNpZ1N5RUF6VlB1S1B1aUxyZjhVR1Rn?= =?utf-8?B?bjRrYy93MWsyMVplSVJGV1NPT2JoN1FKUzZaKytRNjN4dGNDL3A5Ynltem1M?= =?utf-8?B?b2FBT1V0Ym90QXRJSXNWQ3dlNXdPY25tdlN5RWVYOG1oNmNMWlQzTzR6Y1Fr?= =?utf-8?B?Rk1aOFl3M25Da0VrL01aTmhOVy9ScFY0ZlJBb1IzZXJjaEh3Uk1BdVJZRjBC?= =?utf-8?B?c1U3QnBBT0l3RkluTlJVTmgvQnpCNEtHWGtmYmRoK3UwLzMyOHJlblZRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f673c3b8-8a7c-42fd-0c73-08dc80d9ed7d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2024 18:54:26.2043 (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: PRAP250MB0561 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/diracdec: Use FF_CODEC_CAP_INIT_CLEANUP 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: > This was one of the few decoders incompatible with the flag. > Also only call free_sequence_buffers(), dirac_decode_flush() > in dirac_decode_end(). > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/diracdec.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c > index 3a36479c59..5bf0dcc2db 100644 > --- a/libavcodec/diracdec.c > +++ b/libavcodec/diracdec.c > @@ -403,11 +403,8 @@ static av_cold int dirac_decode_init(AVCodecContext *avctx) > > for (i = 0; i < MAX_FRAMES; i++) { > s->all_frames[i].avframe = av_frame_alloc(); > - if (!s->all_frames[i].avframe) { > - while (i > 0) > - av_frame_free(&s->all_frames[--i].avframe); > + if (!s->all_frames[i].avframe) > return AVERROR(ENOMEM); > - } > } > ret = ff_thread_once(&dirac_arith_init, ff_dirac_init_arith_tables); > if (ret != 0) > @@ -429,7 +426,9 @@ static av_cold int dirac_decode_end(AVCodecContext *avctx) > DiracContext *s = avctx->priv_data; > int i; > > - dirac_decode_flush(avctx); > + // Necessary in case dirac_decode_init() failed > + if (s->all_frames[MAX_FRAMES - 1].avframe) > + free_sequence_buffers(s); > for (i = 0; i < MAX_FRAMES; i++) > av_frame_free(&s->all_frames[i].avframe); > > @@ -2371,4 +2370,5 @@ const FFCodec ff_dirac_decoder = { > FF_CODEC_DECODE_CB(dirac_decode_frame), > .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_DR1, > .flush = dirac_decode_flush, > + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, > }; Will apply the patchset tomorrow 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".