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 6B02B40F64 for ; Fri, 11 Feb 2022 09:25:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4EE5E68B27E; Fri, 11 Feb 2022 11:25:48 +0200 (EET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072085.outbound.protection.outlook.com [40.92.72.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E783568AB9D for ; Fri, 11 Feb 2022 11:25:41 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eZr6nz7xcFlHC5l0Z+mM4E5eWHPfW4tz36BOl4vBRM6RfPMYLKukYCltnWHINbtgwEmHyAIUHS6N03zB2UqCBFGpI91Xkx/hUmmZYk1neIqve/3BG2Ac7nmGZple5XaMSbaEK1WKO6osWHG3sXM0xqPGOcSzdB53CAvyXBhJRUVauWzCH+DkVkyUcp6DskYMpvAUECCdDI/vl9NPcnLFJxfCihB+qQmIknJw1ZLCycWGjBnzMFes9Ar9GdB+By1xPXeX1aa9DrCfxghpV7ntFFt3znNHHmRZOMY4xMt1b80iVw6Y0hrSweveBnqecftMBqrP4sk47ZphmwMGv3PjAg== 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=SbIOl3hd2/g8a3lX+o8OGI41rGp2k6UTVjVzXSs5Y/M=; b=P+MFP0Tn2cdOTYNY/W7irmG2rllt5R0XXvRruTvKtih9RvWSrjGL/ir+iUH+Zf7lAltBP7tFehtw0qiGH8B9Fis714ofCOFLIgULuaQbrxAhJsRxiquOJ7eD5AhXL6kpcRxwK0hbmLHycY4hQuMfPfIdibpE30it4NvYQP0BlwEBqYErCLRTu0FCt8B/RHYhphpKgqfQi28fVOtG8Zaqw6rxTnK3xNmQB9PuQTb6r6QnTWWrl2w9GSx5D6Hx/7+rd/RuWo39z9afjj9HsFb8ZEuZarxyPyyRvgUJsDw9KyNENAHC8tRqxs5/iV0k17HMrjdF4gnnK498c10XeROf9g== 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=SbIOl3hd2/g8a3lX+o8OGI41rGp2k6UTVjVzXSs5Y/M=; b=aEC0mw4Wd9T5XHfi9105jyoCzjLnm4V9JVd82FxuINSzZTf9UVv5mpPNxyxd8ygm5fgn5zCxIAea7U5vRyTazkKjdOXkqX/iifqfSXqi6AFxBJWNdf92SkI4d5CVOgtag+ypBm7oFlERFIQjR9+zDwHi5tzexaNd7s34IuFKpdx5GoI5OeBaCo/OzThwYtRz0PzQF9RnKdVKnWNxHBO8WqM/oEXSyoke9ofFsyVekVJqQ859TPq7mmQwOALbgbtQckYyX2UIp/fI0ifTVfWwssqfgiJxWzSjIweuaRWjDac7yIfJ/Yw/p0BAg4mjvZBhNZsyaDFjT5mo5VbRaNm6Mg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB4889.eurprd03.prod.outlook.com (2603:10a6:10:78::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.12; Fri, 11 Feb 2022 09:25:40 +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:25:40 +0000 Message-ID: Date: Fri, 11 Feb 2022 10:25:34 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [/TUd4tqmxPowOoPrGJ0Kr2wfeSv7S3Gr] X-ClientProxiedBy: AM5PR04CA0031.eurprd04.prod.outlook.com (2603:10a6:206:1::44) 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: 3f959687-1622-48f9-a631-08d9ed407890 X-MS-TrafficTypeDiagnostic: DB7PR03MB4889:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FpOCJE3nSfVa6wTgn/wrYBXn4Y0LsP5qAeZtpCmOXqYIIitqEMgww+mJgH0QWs+Z4Tg3/A6aHKYA2mdueZdLUCjNaMcNleqtmHaXLZ7Rb6vSbWut3gwDQ7hq8+0ro/xSTh2et++89YuHI9/DTFt5sHBoq1kmSPbSq8YSrRjEUIg5QXpDDJzPL9mT1s8VBsXZbb/pLAI1zQc4CwW2HqAq+7ozau3SI0OzkTnpRF871/fW37D8IwVBBsNbJk/SanECs7ZlZtixaQXfEH+JbXAl5z4xLQDdgUmH1JMzpnZWzWAt84TCq9t3SNGByWtVxGXNXVRn/9qAKbA82QjPBwGnwRWy3XwHyAGY/HmF/kysOx0HHOkz0Ow6JU7F79mY9hNEZXBWjeazXsKUE819UX3Ufsm3tt5C26fy92IyofkSVW+dV/+uQywTcDkm6gUpLiCRaSUwVueYfTydYba3JAdXe2ijdlNhHFgaxWtHH8kjNY1xTn5xi/aBd9Xp0vHNXvzSB60jW75h40Amhp0RyP1HAP7vm1NOauhVx/jKxo/d93a7wX/xxrEdOkAfqTaqu17C72OMo74OKvEI74HNhAth1A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MHNKaHRVZHdlZW80NTVlNDdCOTZ1d1lCWTJMbjVmb1M0d0dtNzArYm80eXI5?= =?utf-8?B?SVBSc1MyNGUrOEZoS214MVhDbzB6Q1JEZU5LTElQVXo2MTdBTW5zR2RocVR0?= =?utf-8?B?RWd1NEsxZkk2bFMyd0lLdWNsYTJGRGRmYklqVDc2a2NWWTF5MEFOVmxOWGZD?= =?utf-8?B?MkZVbE9wcnZrRmxFUVZsa0JpUlg5NTRNUWtUUlRNZHZIeHFkM1dzMFVhdjYz?= =?utf-8?B?R0NrVFZVdXJpd0o5bXpOOXlNbDQyNlNWY0krR0hkV1hJMUg3VlNaSU1IY2hU?= =?utf-8?B?QmtFcHZGWkpYYW5tNnV4WDFNY0FDL3JtdHpCbVZkZmpleFFkSzhFYlQ1QXc3?= =?utf-8?B?TElmWm1EVUIyZVRzNEZtYzAxQ1hOUUxWdGFmTzE2YWVBTEhidXJGUnI0RTl6?= =?utf-8?B?bWx6THo2WjBQVVpsTVVLUitiUG5NN2w2SzREbk1GYlZzbmJDdVNHYXp1Z2Ja?= =?utf-8?B?dkc2K3NaWmVmU1FUeElTZ3VtQ090R1M5cXlUK3ZyV3ZIeXFPS00xazU3WVAy?= =?utf-8?B?RTQvK3p2dG91RjJtblJjU3J3cVllY2hvNGdHNjJBV2VOODQyM2dPam00QnFG?= =?utf-8?B?OXFCWnNRaTVaNENkcG1wYThIS2lxUUpvcEs0WEZKdkptN2RWbGZuZXQyZ2FN?= =?utf-8?B?OFI1M0hTLzhOeXJhNUw4bEtFVFl4T1NHOXhIT241MWlwYXF0cElBd2hyQXhR?= =?utf-8?B?NWRORGdBOTNteWNZWGV4Qi9YNU1nSTc1TlNjMDBHY0ZEMTgyRkZhQWlZVjdB?= =?utf-8?B?bTlhb05vZkpST3k0cmdVRFJlU0cvTWdNUDZQVFJmMGxyMXM0cmdsbGxIRGFD?= =?utf-8?B?VVAzb1l1Sm40ZWdRM1BoMTQyeVJPYW1OM3Z5dHN2Z2ZBNnJSdVkwV2NzTnM2?= =?utf-8?B?TDlXT0NseC9KV2haRlB3TGtrcklRcGJBZkZSVGNOOVBlMC9xVFEyanhKdFFT?= =?utf-8?B?NXpmdWhJUXYyaWpmMnlTRDRRTUhFREpIR09SRXcrT0RhckZBeEk3ZlhvWXBn?= =?utf-8?B?VXEreVcvUGoxMjNVZC91MXNpSGhQc3pMdWk2aDhKb0kwdGRBZUcrT0VkWTZD?= =?utf-8?B?QWNIbitTUHJlWUd6T2k0dmJ0ZElHVnlrbGR4NnJuNmlzc2pjNjFDS3kzU3l4?= =?utf-8?B?b1NJdGZHWGZiekJoQ2VIVTFJaGlzT0xNTmFYVmoxTlJuRkJuUm00QXFHNnFz?= =?utf-8?B?UnUyWm9PQkkrVWU4Vk1oKzhjRDJ5a2d5NE5BSnFkelJZWURsaGVkeWRiTkx1?= =?utf-8?B?MUkzcC8weFlWVXlCMHRraDVMa0dwalEwaDlFMU1HdWtISk1IQT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f959687-1622-48f9-a631-08d9ed407890 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:25:40.7946 (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: DB7PR03MB4889 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/tta: 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/tta.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/tta.c b/libavcodec/tta.c > index 17b4ca9032..accac38893 100644 > --- a/libavcodec/tta.c > +++ b/libavcodec/tta.c > @@ -114,10 +114,8 @@ static int allocate_buffers(AVCodecContext *avctx) > } else > s->decode_buffer = NULL; > s->ch_ctx = av_malloc_array(avctx->channels, sizeof(*s->ch_ctx)); > - if (!s->ch_ctx) { > - av_freep(&s->decode_buffer); > + if (!s->ch_ctx) > return AVERROR(ENOMEM); > - } > > return 0; > } > @@ -427,5 +425,5 @@ const AVCodec ff_tta_decoder = { > .decode = tta_decode_frame, > .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_CHANNEL_CONF, > .priv_class = &tta_decoder_class, > - .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".