From patchwork Tue Feb 8 11:14:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34175 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp704591iov; Tue, 8 Feb 2022 03:14:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwP7nfkk+quUeML7AE5d6jP/mtqIHbMRLOBP3dVT6XO+xvNLtHogA6Y9Iit2sDQ/y0bhYXh X-Received: by 2002:aa7:d815:: with SMTP id v21mr3865970edq.160.1644318861185; Tue, 08 Feb 2022 03:14:21 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hc19si8972152ejc.382.2022.02.08.03.14.20; Tue, 08 Feb 2022 03:14:21 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=Qvuw6yUr; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1BDD868B290; Tue, 8 Feb 2022 13:14:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073103.outbound.protection.outlook.com [40.92.73.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90CD768B231 for ; Tue, 8 Feb 2022 13:14:10 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YdYEZ5sIzCGf20HrIzCBBfbPniRg/v5QkRqv/yy3NqB0ofyZw6AaYw7/xUFu8GQe6QRsOaAzCa9i8d6t66JCNfENML1NqrPOpCZ5xyvkLKHW7H7p2jGhWykRhUDFhEjIhxw3URD1/nbdqstpMAxU4IIWMUqSzOsOOcdG46DVLykyGyqmbaqtv+7eUBDQUe7wymc0Jtntnho1tyfIaoyRA+BVWtVApPWjoJKbTBUhmhQmtIy5Zhx+fnD2tNWUaLhTAPhPrvyWurr9+e21hyOAfZEqwyz2WlxbjbQEQcLGwixFnD3cUd2d4/E8ZeG7v5lSuPOffa+TgV6PyQs6ZYeJbA== 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=l42f5lTofKIpKCtWanh6XlVXC/uC6CB+TJHBMMkFH/s=; b=lMwdNK7au42A0ygUQTqMbvd1ApOfYUU8ee/qxYLdCTb3mxELi8anvIKkK5To4vtx4qBtCT9BZgtxfkDVSqW/QG/JH2fqd7LM5Hb3e/71zwc/NvspXWPt2iyqHW+T8KBg7T7KioJ8/Yqaoj2NtQvobmIT+mA8Vq+2/1fcm3Ur4PglFY3sOFZA+TnCG/sLUvbYoJVXJdsfBl4poP438iYmx0U5Oacnfvf9f/tqdhwIL2VGqStfMmI9vOD3JOfgKI0o1t+7ME5+Wd7qU5unE+8XgoYRfs377uPRXdPDPz0vzUltjBcsQbuIoiVa2zxcukMnPngs7P1S6kplx+ICj4omoA== 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=l42f5lTofKIpKCtWanh6XlVXC/uC6CB+TJHBMMkFH/s=; b=Qvuw6yUrDlGq0sMeu61NA0sQmyPUMsSrOXeZUWeXys+V5wp9Tt5NxeC9bSwiWAEgZSzuQ/BTrbIXe5tPbbZZM/uwycPvgcCLDchX9gvui+vMwB7oYpPM0KcPffQ5p5IABZosSlHwzW+k+0OhcTjnxBMrVBBd0z9nC1p7Obg5QL6QvcN5plqejUl9TBW81EzcJfR5dQYzimvCOPxpSjOE7UQI4d1ffPCXqmJKBJHWQg/ZHKr8lRGbqClo3w+g9jGxAfTClvDNBX1vkv2pNVby7P7nw5sO/u8CQZSEmr9EOsKbGt2WYiZk6qSLfvYasWOboP9ZpDZ6yeWV/71I4gmBnw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB3659.eurprd03.prod.outlook.com (2603:10a6:5:4::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Tue, 8 Feb 2022 11:14:08 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.019; Tue, 8 Feb 2022 11:14:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 12:14:00 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [wCYsPBvcC2U0u/n6cMupCEX4WaE273HW] X-ClientProxiedBy: AS8PR05CA0020.eurprd05.prod.outlook.com (2603:10a6:20b:311::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220208111400.1076904-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9ebc59e4-f206-4a86-9238-08d9eaf41ffc X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQlB9bKabCTlQohqaUcoxYjTJWMzjH6gTr8gn1XI5MTcRVngJsfIT2LhgBRgOUCaH6lV99hC7qYsWepmQM3V3RDj22Fl3znbVeALVGWtOLn/rw8zd8c+C7mMGQAxXD5MT6dJiPRoD0kln3ATTl6XbrN02dt+m2GM/yN6Ue8C/bcR2ggg1Ezb69IhRxKE2l26+Ih4z3RKDrKoEzvqmuAtuyS7mbHtMuXQ/x0vFcwvali+OQjEo6B1ySvMVR2EG22Lwv2V9Amu0GrpG+JNd0lcyNobDQH2nTcjaqdM2jv79JrkjQDa/FA9yy02aNAE5OiRjjFyCs4TJB1vhXpBO/ydmLzj18VfdpXk63b6K8qRV3IYebcumlMUpfHcD+MDtSVgYwzlVFHCeYwKqlIA5mQj/NIN5ejxuvKjoA7bHZBTOBVIr2mpuNxvK3fVnjLSW7si91PAuh0spzuvuvXn9wftRvkcolM6ldRTohA/8GnXQ2k/qB7Ai+OyJU/vfs1+RG9cQ7y0D4tESCh/oas1HVWK+jMiawC7Jd337fy8kqBeG/Bh9KldRhmBLoE/OldpM2S+IKOFZkBD7eha0i5mKWq1+YhIxgWVJ+py6gyQFGrtsd0jdmBDS9y8gz1Tkz2NNS4AsBbC87hlJ2+S4jomrfk6DaA9C/j/5CuJMwY1leP+k2nQR9o6J59FLDSDdK3QEKmyBJYVYo3ttgzAmnczdKG/AsFw/smAZa1Rngy1DntCjz7Uo38+ZqvYAbqLaLIZ+xkIzk= X-MS-TrafficTypeDiagnostic: DB7PR03MB3659:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n/J+AUJfk9/J45RrhoXYS7AWNSv0GPw+N6B6J28KyHxek8fgXsW3xB9XM8wlxgkAJCENLHCI0PXpOF4Y4HLbuOvT+upEHpD/kSxPeOUvBfOh2rICrGPxx2G1rOoJSalR4DQvfHdEPAskDujA23adKybcTguAqhRLIztr9kP5h2NJTw2wzFxH3JAsayAWf6yScEsqzmTn7n6g/f3/bP1QRMjzUj5F6gAoe7izH5n0ue8ndgMaEuWTEavO+wGZ3n+9KoVHbylNMLRDDv7P5xt3htCU3bSqHZ8q0ojJgiQNFz5VX5kcG26ny20fugKdQ5K6h5TzI0vuZbLN8fttCE5EEbT3xTpKYgBpTyVcU/OD4XcD23qHcWY+VcwbRWmLGpFsFHNvy7F/JShlgZx3KK5uGvURHdDr3zvscq2QvIEWPmfK7ChYYzWoi6UcPezi8Lr7tWkiC7PtGQvy7hRhSNuecfHkjmUFXb9Mjg1JCHNRwgGFZhJu76FVGcOqlBV+yeT1aaDlHAEQH+k9YuqScZEQjfglf2bSAktMwkwjpeLKPiAYhhspNrqT/8s1dTAlI/Fscaf45ACM+nvKkEc06IK1Yw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nn5ng3IxyEqZBUwvyZCVOWVV6NwvyiSqSbFNiStvYevTCg9TlOOlm919zHVfNHQdgjTYUYS1qLUL0lFXUOzEZHnm4hMsKs1HbJbz9IGMApaDUSRHG82Gw2bX1ZFV3Yp/KQoCdTe7+8FmCpfgKfOzTjUcwHoxIq6xKsIh/8l4tZy7IcQDAW0wRtP5z3B9S/wjEa+l4qTuhfA8aa8gqqsWaZ4x6JlGM5oYlE1Tplbqoimz/o7Unt+goll9Rg525uoU7gfqPquUBftReyqzskxsoRgIFps4JP6/T2qfp/mDouSH4EikdPxA0tYPxN5Wzz3jHoSqM+oCcM2huX6aXHMJnBYhIt10dJcgt8LUSlBidvlV/zVcenNLqMpLv8LKpuyl21c7nA2Lb1A7DLAhDKKl69uKw60IUYAPcmfRp49MFyEEGnVXr4VpkCzpuhNkHhyc567JWPppjK/+L067JREb1lE4ET6u2zi6U47LLJK3wlYFP/HUhTXZ2y34WePUevidXCcFIQrS6uwy4RVsioJgyEfrWXpT2NyIidrLcv+OtAdK89Q+qTeZpzGgbB0rtuknxAIUtGWg3C95xd0IElBLZcn42tFFV8ndtlUAOsGN6lFefVDl3nFihlN7MKPOfYy9PUGGoYU/d3bSB1Mja++s8Oj2gYtlVfJuuVdQiipC0ylgYjWz/udcfc23PtoerafVWPIFxL2z3QkbaWCg/eahj4U0PPwnMfbEgxp7ot+pjHHdoRf118YXzwDmYFGvpYO/Uom08r6moJupLsfbumIfK40bLzFtLHjtB2B+AFR4CYvpK/sztWVamnLzUvghrOdw+j5CVYO9XV/fwFUp3wqqEXof7W4nTq7sVD7a4K9K7XIwa3Y3gQCeWWHjKJ7ewNSWSh/1wRaEFjXR13jxa4t5FoFVF8rufXX1avbF0egoUkDBuEbuHSRB6ZBWMXDlOxw8Gvw16raJHoDf8RDzabt3jw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ebc59e4-f206-4a86-9238-08d9eaf41ffc X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 11:14:08.1245 (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: DB7PR03MB3659 Subject: [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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qCGdeaZtVtON 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, };