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 E5ACB40F6D for ; Fri, 11 Feb 2022 09:27:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6DB5768B285; Fri, 11 Feb 2022 11:27:06 +0200 (EET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070088.outbound.protection.outlook.com [40.92.70.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BB6968B177 for ; Fri, 11 Feb 2022 11:27:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gC3PN/yll4ZcZKa1MkIzJhxzFLkfl4IxVb7vIEP3PuSZS+zcEEbplBkFBlzo/JRqZxqKBCFgLDXsvS28d8YiIzx8ZUE1NV2Ams0EjsUx5eSFUl8L/qH2QkFy1Qklq4u3fKiWdr5lBJs9FM20aNeh8MButQ8U56tTi4zx3PKtP9Ccl2x8VdD/P66oc4ZRlsibGBRUBdEVa8pjC5Zh7rpUNqMAmDuX1H0coOPXgC6tpKzM/hL89QgnZhCoRTEiV46F6H0sHjr961UH9fZj6gBJ5BRgHw9YofBZKZO3BGEy5TWlt2PDgIT0z7LEz6xLhST+tRkI5eECEMkiilZZDEVmVg== 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=Sou756QCXjufwga2ClrtsDZG99NHfGsqkNnv+VEAopQ=; b=mNkXatc0ugCynM6lSP0+n4H3VPADwOzf9EfD+1yWgfC4d3PVrjfGkAzaBjbanYO/LsZIfQWwccCHFjmM/xUMzxXUIWBZoIgY1wvVtrI0fOy+raHt03WLNd1/rN1M3zV0nxwt+z2rEEkImA3jttxQ2wtZcPQk+JsLgnWT+zru+eIw74GdAFT8zFXfhkFRjj1MI0AZ9jw7OVWbVRisGJhL5qyj20GwAcVfPY4cqJIBUkTE/AjpVTLZdFHT3Y9uuDg62L9PZhrOFEQsPwqAUGa/AVQc3mHjli/hRuqUeeCyrUioYJASsIhUkh/RcKW1LZHs0m74lIV0aJfYp9hPSB64sg== 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=Sou756QCXjufwga2ClrtsDZG99NHfGsqkNnv+VEAopQ=; b=NsO7Y6PDE32aBTgQjxgjgHMuWreggAysH/U0BXb22FSQ/7mJTykJL5zCZxSNMRjYd5KDb2q/X/W0bL/3TAP9Q7Gix62FtBA7cAW62dmC/gow9j+uKUXGD9rvZkL1D6euIJ3VP3h8YwlCuzFKOn1nB6yUDE6rNX5RzyMRD5sxH44ApvHiQox+LO7KyBo1gvIyR0Mhpuu5EcaxEm7Fq5ibnNRBBDV+1xB6Ke8guWj33wqWfPDyzBwmjJPv/mk01+kD0bgA6KszzZkDpaH99f0O/o85Ma6yTCX0t53QV8UPiXzam6dmVJVeq3SUDmiAFq+hWy/wICD8E/4kf9M/QS1fyQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB3853.eurprd03.prod.outlook.com (2603:10a6:803:68::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.20; Fri, 11 Feb 2022 09:26:59 +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:26:59 +0000 Message-ID: Date: Fri, 11 Feb 2022 10:26:52 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [94hlRYqkSRvXLKQdGU4FuOhq9tRPClKu] X-ClientProxiedBy: AM6P193CA0086.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:88::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <6b8b28eb-a4aa-05a5-24d5-30fff6ffc2bc@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 14fad58b-05d9-4957-b6ea-08d9ed40a734 X-MS-TrafficTypeDiagnostic: VI1PR03MB3853:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xdkoUm2zR1Rt07CHWzReTkwXw2WehjEHO0hpad5lLM82XweC9wRcTKg/gjo76ohChH8o3dzo9sgB0nEYG+maU8lDwQs2BFaws+OzGkGiJn75d4aunBPVANp8WjhXmF1Fnqys4Ii50V2ZF8BGpD+1Qfr6gSItsjT1HMaq5yTWSqBfgrgksz6cYtsU2rH1tGI1Q0foMKUpFbxlV7GzB+veK/rx03Y+yo6eK1eTLJQ5u5Jk9IOTLYKYeUXYpXkzc8GtLf8fkoRFEgV4u7SEZIEE0OmdNDJMXoUsSsP+K4PjXG69DixecUEY7p0yKxBfdWyWJT5tv+cQ/G26sv/qfiHI3hNpxUodmFscHkss7FSPLL3rdT9cr/krOH+JR0lZ7Vz5FkUW1E1PMfcUco96g7FSRu+WjYUnNoKE5l91VVdR+BXSbZIJNyY7CZ6rt2Goh3wA4ftqA9qqBISq6Zy7OlSJ8IMvMPrWRWO/Sk7GJ3czo8dkW7LOE/YCOw8Rry/EFwgzUS4uJROF5WIu9ukMqtZ1HfzNOy/BCMBqcLmhYxKFsCOELkP89kBV750cRKujTbekYrT41K+pf3Rc+CDr+76j7Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?K0hKVXNEeVYzQysxSHB4a2Z3NmVrTDVOVzNHSmtRWStvdWNYayszdkJMcUpp?= =?utf-8?B?dEtjbXd5UmdCa3FJUmFLRjVpTCtub2x1M1JKTnFvTmpyZGlNOGtIU2NscVlI?= =?utf-8?B?NUozd3dtcTNXdEkzc2g2TzluWThsRVlIcm40Ym13NXJ1Wnk1SThzNG1WME1w?= =?utf-8?B?djc5TCtvYmhLZ0IvMjh6bTNpY1duMzc4WlRGQXJuYURCZ21RbU9aSXpER1NK?= =?utf-8?B?TnhuUlk2SFJITG9QcXZiVUQ4RitvdEVDT3VTVndBRUF1OUJSMnVpVDJpSHI1?= =?utf-8?B?NnBmc2RUYmNiQ3JZRzNjdDVZUGphUGhiaEp0dDVwMVlaTUR2c0tFa1FOMWpu?= =?utf-8?B?UUdOZVdiQW83WjM3ZDNRVDFmYmlQaGNDcFZyNzlHckRxU3JzczFSdEYvcGRM?= =?utf-8?B?SVpHbnBtaTRab091bVJqS3doZDBUTDhEMzc3d2thek9YYVVRcmxQYXYwSjlR?= =?utf-8?B?SHhhOThWMzZkNG9hRlZNK1B0ZXBJS3BWZkN5TWpjaUtRak5kSmJxSVFvK2ZU?= =?utf-8?B?THp1VE1uWVZieUYzcGdYYThIZzF2ZzV4VjZDdmxSSjErb2FvOXBaUW1pa2hv?= =?utf-8?B?UkFERnk4QVdpVjBTcjB0c1AwTjNJL2xPck5OUUlvMmErMU0xUm0raVpOREc2?= =?utf-8?B?MEZuUFpWQjNBOWw3UjNuUU13TEd3c2xwMzZza0Z0TUpyRkRwL0NxWUJxSFp6?= =?utf-8?B?bkNXVzJkYW9ERmtocGhvd1dJTXJZWHUvMEY1ZUxGK3ZUTlRpZ0M2QWJ3Y0g0?= =?utf-8?B?dnhPR2tYMjhNSnFFOTE2VWR5RUlGOVZ0ZTd4WGZFSEhEVk9oY1V0VW5PQ2N1?= =?utf-8?B?L3JRdG9VeG43RnVjK2UrY2NuNWkzbUdnWWkxOCsvbkIzTC9xdzlXaERNek41?= =?utf-8?B?OS9OT3ZqcmdVMGg2L0JiVXdKY0d4aXhhWU1iMkdCYzIvWDlOT0c2YWVDYWg3?= =?utf-8?B?NFRheThSN3gyWUdad2dRWXE0YVlCYWZjcEJsT3R6RmhNeTNCRkNtcmF3S0hW?= =?utf-8?B?WXRlYWV3SC9vYXFGdncwdElRUUJsclg5THpQZzNJOE9TWXBYcWZzS3l1K00y?= =?utf-8?B?aWl2K3dYQmdUcHRLNlE0M1M4MWFUSXBSSlpvU1BCTVdPYkl0dy8wdTZDQWEv?= =?utf-8?B?OEQvRDlXNm5lRXJvemF5NHpwQmZxc09HMjhPMWlPOGJnRWJpdkRKQTRzQ3NI?= =?utf-8?B?Vml3VEE0SGcvNEJta1VhazM1TjYvemlGK2hyOTRmaDlGOGlZZXFnL2N4VWtP?= =?utf-8?B?c2hHdEdWeDJUa1Q5cWdPNzIwdmIzMmt5VGhPT1VZZ1ZoSnFxUT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14fad58b-05d9-4957-b6ea-08d9ed40a734 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:26:59.0293 (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: VI1PR03MB3853 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/cavsdec: 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/cavs.c | 4 +--- > libavcodec/cavsdec.c | 1 + > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c > index e29d9c659b..5367c44248 100644 > --- a/libavcodec/cavs.c > +++ b/libavcodec/cavs.c > @@ -812,10 +812,8 @@ av_cold int ff_cavs_init(AVCodecContext *avctx) > h->cur.f = av_frame_alloc(); > h->DPB[0].f = av_frame_alloc(); > h->DPB[1].f = av_frame_alloc(); > - if (!h->cur.f || !h->DPB[0].f || !h->DPB[1].f) { > - ff_cavs_end(avctx); > + if (!h->cur.f || !h->DPB[0].f || !h->DPB[1].f) > return AVERROR(ENOMEM); > - } > > h->luma_scan[0] = 0; > h->luma_scan[1] = 8; > diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c > index 894aa1b54a..54e1877bbd 100644 > --- a/libavcodec/cavsdec.c > +++ b/libavcodec/cavsdec.c > @@ -1319,4 +1319,5 @@ const AVCodec ff_cavs_decoder = { > .decode = cavs_decode_frame, > .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, > .flush = cavs_flush, > + .caps_internal = 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".