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, }; From patchwork Tue Feb 8 11:34:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34176 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp719034iov; Tue, 8 Feb 2022 03:35:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJyM23On8DgHbQnn3miPOWTJ7ctPfoFBTl2mx9ulafAa5B65iQbZIP2qhRlMb6lDZiDSJLRD X-Received: by 2002:a05:6402:84f:: with SMTP id b15mr4062017edz.206.1644320102821; Tue, 08 Feb 2022 03:35:02 -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 cx15si3381921edb.67.2022.02.08.03.35.02; Tue, 08 Feb 2022 03:35:02 -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=rsD8gRcM; 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 E2AC468B2A2; Tue, 8 Feb 2022 13:34:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075052.outbound.protection.outlook.com [40.92.75.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D38F68B113 for ; Tue, 8 Feb 2022 13:34:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kKgxAYHL+/SZF6aAsmViamio1hrYvRd0z5eMQaluIWrwfzgVHv/IfbH9PBleDR5m0QFWFwPMsoGqnMh5BSs2dAtJYimzO5JHpBL+/StQb52UKkDvT4gi99uPQj6uC+R+HHtC0GUyjO6uGRQpTO4KW41kbuZRJI+ifCQUDIkhqkUNKXVk4KngJk72Z9V+/nxw6ze8Ys5/a5Iu/Wh5WISSCG12diw85KIWWcIeExI1/dfjRzKs1U7fO2ulSYyJUZM+WXm5DS1xJ/1Byi8wFqzOpu/4H8zPDzzQVXwyAWQaLpddQ0HNjMgA0wYOswnPKQlzkhMCQw5/U7536F8Qt/+8zg== 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=Uui09is4t4jXr6YdblyvFdc/RSuWKZD2+t1R6Q0Qrik=; b=bpbPNZcD9WPa+UYg157lUgkgoC4q20+e0CBirelUMImAo4NGCrShcpYBaZtWtcL2jzM3MU34rH5jx5aYqcJYfBW7k2b2DFPKDTZasUv0VSenBd/0xPD82Pm7CTQEvOBaxP0i26pOhcO8zZGB5WpxAnIc46SZRwID+PsMoBu3rPehTnZ2YHPGLO0KrfFHAFOsSfRKtTQiRfLlztOzytN/wDts8f00oPwftcR8de2lpZ81F6cyW1WsvAPCKV7oKqXNMJ3OJlVtxcsSjUFejA2OoKifQNs1Hqiha8uiBpjBjnPzXaJUGHrWusZ2lZv3qyhtra3fQs/AjkCjeBPXb5sRkg== 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=Uui09is4t4jXr6YdblyvFdc/RSuWKZD2+t1R6Q0Qrik=; b=rsD8gRcMK9R7MLh8JlIOpBQRecnbTo9NeZwZdIdwG1xJQfslM2Gtz/pqARlA/+zP3HxzQ2QjyjHwks/yZoyGarPfVlBOs7XnO0svrJOJn2eQfeUHT8bBe6G+19Gu9DABJf6/7z6Ekid0nVLveUlE6pXvXM0khGdyjRUC0YYFaM3ZyEnmdOD6UnZxLTxcl0xfWx8X8qrz9yxlPJzn0AVxOZW9UlNxc/nlMl3PICzR0Dp4zkvEpeMSA+MDjAF1RUq+Ytk5ciyxgUDLzErOGYMWD0f9Z0eJc/wxEBaPwOqYi0zYqPYzPlk2A+3h4c0KDXyMa7flPYsbBiPcQ8SuI7bnFg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5880.eurprd03.prod.outlook.com (2603:10a6:20b:e5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Tue, 8 Feb 2022 11:34:50 +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:34:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 12:34:42 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [NqO1ryJjSPVZX3ELQmn8FaG65L4nz5Wr] X-ClientProxiedBy: AM5PR0402CA0002.eurprd04.prod.outlook.com (2603:10a6:203:90::12) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220208113443.1084314-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5a8f84d7-40b4-4aef-1671-08d9eaf704b3 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQlB9bKabCTlQohqaUcoxYjdYOdFlKXrCX75x0/GAT3cIw6BWrxoYutb1W/Ev0aC4zeUIBuyGnNJCA5JKuPZGkpZ0GAhG/kr1rn1h3Nvqv1hZbq62F9m37cVO1bN3kbJnZ1cc23ONYDBOfilf8yf4+Dvk46nmgSmdG1t0zwizJ3pZOXiaNyfv5mjlL/CCNflEQkVN1pn1vVfHgXaKYG4xfdTXcb1W1BRzPkRZEaYHtuKcmITNh0jFLVhaty/YO3FNfTJLUxE+3Le00liag6Wuu7L4I+a7ERrCEc8+7uWCqDHUOQiHjRz4c7CibzFwBtqTvB+Q9sZ7gz78IUYqyO+LoLmv69wdL5gV7UYer87ULhQ39Lz9lPif8PAdRgPyZWp9VcQ8H+ZH9pmeEdxqehhIarQD40Ktw4uta4IH4iq/BD9aNevxzQEbp697gonaDH1nLbwXuos2MLQgMQf6n2BJi8Vwadnid+Ye1zF28RS/BQ1N7Y/sZ+WIfc6Sqsgp1bPCcfUOggtsD7clxZTTOHXM6H/keV9KhH2OQT6dlij+CITm1hrNmt+G09aLIdjKhEE8iMlySio2B5FzC6ZwPCWUKRezjFNhltTzmlLnYR9MjNMW3Pre0Z1YUZ0WMzhy0KK2MBb05AzL9PZxLBQINY0QDzpl30aJ0CmX/dj2G91uVLfbeJ0Pqi0WwJS/TltyGEJqp7TRt8AvFFAD9rJ3r3lDkha0HuruVZN3moEmLMhOoEO0dFhv79MZTz6vgHpWp+PXo= X-MS-TrafficTypeDiagnostic: AM6PR03MB5880:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FnjLp8p/jeJ3uYfNQkp2C5/MqL0BTiBwDNLxd6KMPjsOgwi2FkxwSOezwBTiV5d1b8T7bbFgJ9IHtVcKePazejNs2YdaXA2t1Bjs0RLgYQRF6afU1oVmmUyXJkZ2xXjbG7h7wLGgmi33k3HK6KeN03Cd4r/cnJ14tHvMFug7HbyrSSFNpPxsSVF5SVtdcsiz3EheFDJViXcVHbF/X94Y2kRoGfA92UIjfrIgA62WNAWdB2Zgk0nfVR/C6cguSibzD893iHYagWW+k9LYix/j/xbrHmCxuzMxzI8pWq+0LeliaF5AvQ9m3dfBq+crafismFYUb8dfCtTBTfEicSiTFRZT2cvxBzmesq2IrymYIpp8J4GIjDylnEQ0L1gEeA6JLmxzC9exJ0veJQF2o6nTM4XHEtSHOM5uhliKeRLi+wOtEhrL+cinHXVbRl7q09VfnmpYk6nAPFCT+wPN9RI9A3SdwKoZuGAQozspHTKHFibFzV66TRuoP7W8UTHPT/E/7UrcS6HUBKbisWTdyz+VJfNjeW9ezLlmdU1IewBWHxaaRiPvyLYNfzpArKwbmztafmlV4W556JrFvhEp3745Lg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LLoQyp6DRwdferJ54eLsWUcWK7Kl5vXnUKkWU3+1vpcotroYXypGMKG+BtzbFWY20pXxOGsAkOMoSOtcGv7fE8RU2IiOIYPgAR+Cmf7b9go/h0+VlKwJSxZXyiomY5rmO3UkjjN5AmwDe097gZP4PURbP4+deLfUZpoBxIaUNElzs0hVXlggHATDk0L9f2ORtn08Gh1twKS/cMIpqT/PdJnupUV+R5qqGWydvrk1mk3ZVER/CgjnN1cEBt66sffkimhvuwkUw3rLh0iApNa5YNoVKRlhY6GPaJR7inKLJLqyOVFo4YSWr1NblVNdei5t2dUwVsbtJh2cJd3txJW5pCBXV2MJ0LzVQr6E51QkLm1JKhETn0fcHTQxn1NmgV6HdR7ZptPKdpABwV4oY+X5AHCIDXFzOqEnOJxwMkpHEPdskwgJ7w+2PNdm/ms4ggg5yZ4pS/tgykeYs9+yQGoDNO4HbZtLbH1hYwzGqoAs3x8XmFXGnKkqeY48jwVwbIIBfIqALJDIhhsn5FVPJzcLYnGZNa3kD9fG0G4DrE5MLneLzk2fvXvhGKOLz9ldYdEByCbw/UN/hpxTEWtxhB7HR9Wy7Pik+vwxCmNwY/OFv8a0DKEZKQlkJwU1Ie22Fm+TCF3EAkQt9q5DnI3He9i9X4Q5/tgHflyb7qtG/B6mNQPHn4gQcpq3Q6lmLMv6gDDzTvRHP8zUBPprhmmHwlEvl9BsXi67VlsulxKP1E4p+ZHZnOXa21/aHv+D+bmMi27uBAB+GfJoQUGccfRVJF/QvzJzoKaXdtz09tPNh0acJxpjJxK7bBdk/KwIgtJOfHodUYdPrT5iNnZpHC2qvTPheixu3GKt+Qu0lPg6DZYcSMZ9zngkRS+NZASZzote+V2MNEZGOrkCET1Qz/xFfPZcG0aHxZ0xtA5yupvwsl120AUhSs17dLnSn8AdvgomO6TrM8SzYfP/Bgq8m/CdOuWR8A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5a8f84d7-40b4-4aef-1671-08d9eaf704b3 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:34:50.8958 (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: AM6PR03MB5880 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/cavsdec: Mark decoder as init-threadsafe 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: YVjOtzIFYv8L It does not initialize any static data in its .init. Signed-off-by: Andreas Rheinhardt --- libavcodec/cavsdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 54e1877bbd..da9aa94deb 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1319,5 +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, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; From patchwork Tue Feb 8 11:34:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34177 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp719157iov; Tue, 8 Feb 2022 03:35:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbfJD4gZKCXTZAGfWm6St9+QL72VOX3vF122aOZLvnOu7btp57ig8DTC483qvyPENSH1SR X-Received: by 2002:a17:906:4fc2:: with SMTP id i2mr3218003ejw.644.1644320112363; Tue, 08 Feb 2022 03:35:12 -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 i29si4675372eda.638.2022.02.08.03.35.12; Tue, 08 Feb 2022 03:35:12 -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=essB7KE2; 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 E30F768B2B6; Tue, 8 Feb 2022 13:35:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075102.outbound.protection.outlook.com [40.92.75.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7B8468B237 for ; Tue, 8 Feb 2022 13:34:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lw/7ffB4MVtvR2zOMpQIY2AVAbk9Cccv1oEOWQKQUYuDioQAhogFbKynjdpE3Ik6cD4aiq3NDY2ARXHOAzSspQ7KOn+GYI+GfvLj5gxsjifapPHey52fjO5hhUMaBAlxrfyidrGQC497RyU2NaBOTzzoG9zWLjoG8GFui+/+C/UhCRl3zthIeHDMRZ9yR4LTEAc+71Y5CMadsu0W7i5dm3raFbX5Jf+Nzo2legtjyinLuccuSPaxRfUY6KRxgXqYZUW6M0AqaZkURkAgYKgsVGPBcD0S672tNAx6NUo3vJn/I/g8BdrqLHs4ttOwPJYw0uAHDbiJIRcOOzd091qbMw== 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=jl47cqbMwsA9eTxjCQ6W+x4pvvwLiIXSRdbJZqvWlPk=; b=AJmMzHKu1j9Ak0ez+LCEQxqjJtd9LCkuaX1WWrn0GsCxzz20aDpaA8eLyY44F4/S/9ijAE8qqool6GIZvbxOAGyC670kWSZqGHwlEvDNUHYYM9h9zKKyGyzNuPd2VUXUdcHzk1fwkpxs/fn6N3GsTeoy866zm31UXF4obSrTAIAAJ36xzhc2piCQReFSik/UbASTSVqhYxIXuoH2dXvsEuW3AKjAWuq2VMEQgJ4UerYIMp+4PHWVVgndpx6Os2TXNQ6TGgx1IEi46pu/uYdySq44CvWpYkC/vBH3nwaloPSINg/U/3EpMSTnpo72E8HXDfG1rCsmKxnvwu6c+iiqGg== 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=jl47cqbMwsA9eTxjCQ6W+x4pvvwLiIXSRdbJZqvWlPk=; b=essB7KE2yxEXGHJh6E8+t68b9UqeLgiRyUrBqs+TLBgPnyATpKoNAponr2I4WDez92rjsCqK0gQ+xL3dL47Tpa9pe8xRXsyB/VL7AZaa1fFHZrXgduxedHtyzqGgKYLrS5cG6T92cUE42YamG3m2fHdml++DTJ1U1cT1L3R8zqAcTz4tGcCOwraTWjrSWhNXx8hQrOerhXA1YZPuQ3h/RL5K3LMov20fvN6rElRcM0Zo04cCVcNQ2vnfQhY1fFPp1LIflsfAl+ZFKn3dcipOQ9mGRTK3ZLkwdXbQrpNLwAg8Qa6ExnTRErHsEHVknQ5FwxTBfr+O0hUzN0dRxwGCiQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5880.eurprd03.prod.outlook.com (2603:10a6:20b:e5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Tue, 8 Feb 2022 11:34:52 +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:34:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 12:34:43 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220208113443.1084314-1-andreas.rheinhardt@outlook.com> References: <20220208113443.1084314-1-andreas.rheinhardt@outlook.com> X-TMN: [8zYxQWUJyCHnkjgLsDhmUGbHlbhCInAp] X-ClientProxiedBy: AM5PR0402CA0002.eurprd04.prod.outlook.com (2603:10a6:203:90::12) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220208113443.1084314-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f82e895f-ae48-4143-3fad-08d9eaf705dd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQlB9bKabCTlQohqaUcoxYjVIGThOV0etT0TBexUOR8sC2lxzjyHwFHJopvyOzEdtv0zfKEq4ibabnQYZLLFoI1w6gTj+bxJV9NKm3NZcr4r1luJQckJAww9PpGSiUGSglulZO8+zMS9Iq72MFybK47Uzrm9MKd2xzm1sur0rx9l0A9vOBG/Ekc5Gk9vLvckvlo0J1UHsnzIlPTv1aYACUFCnQjUylF5MG9KgDKrnqFrj2vX+NxNBKavy746wmXdf7rr4Sl17MQ7NvkdJCuelR1NZwxjBMJVd4cKVhlvX/Qm2lHn6V17J5CmxO63YM1YPfAG6Tiel/3R5RgUlTOVAKI1mEHWB8wG9vrdAdHNhrP6sWPDjnndzsAk5iZg2RT4dwWHHGiHQMBBGsW0DFbfj1lMZrgmdr1hN2bb4q3HA6xwh7/ICOfrLGvSTooqQ6NyakdDq6+WhOAZ5Z3qjvyUjdvVHaggWehXMNBf8URhB88FTuNXcwntHig6SSoUqlQz2VtitUSTSjUH41X0Qpj84KBUq6PxqMB4j5TSsUaHRUJAlJW9jZ6Ln6/jvN5/FYigrKmtb+alkUtu9CBZ1YfODwHaJTtYOTXAl0UTMz7DgEZycH8YEKUvdKgDPdJe5ofILMYYTOty+fCA3mevQPRD3swIRbILGiLnvSM+YrxPnZdDS92evXK4qpD8S9HALJzpAoqpfBdwIvKfK6gLR6NA4efiPRtytL33VkYpSK8Y9LJGuVXt8kMJXkzRE18Jbdgg7Q= X-MS-TrafficTypeDiagnostic: AM6PR03MB5880:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OTw5CaODF9mHAuGirWT+dZbrCaiCZrOLyIzKAHn/1g+2mqgmOjg2qdFh7JFbQMs7r+VetR8xBYdbww8swn23P9nHN4yVt/g5+J17n0oQuZEYd1erNBFOVJ86ZW16zyRAe+5/3iS+amOb374/RONW4QFT5kOu//1SAKIPwJE7wtLUouDOz8aTT3qXnSTR78ByebcNCUF2zI2zf5fCXFV2njUY1ojJR+R9seC3QADo5UrqkhT2kUsdxjIk+Goy0mxxGqmCwH0m6CYxRLEq0gjGLBY3o3xZyBi/r3Zdkp9X3G4vrP+vs4vxMI7EBMy3vXRI2pUWulunGZ4irEsZx2nVscOLqRfk9i/g+QbwTW8cRCMcDCqtvDTWzr4A3zd5irPyz2VCTJhp4ozfMnoXZzoiQXvvrP/+AjAUFnP29vjovumF1kxRtS/AW0qZQGDuHYcd+jBEJB/BOkBTkaOzLUIS6zGQ2tFp4PZ6U/N4EbrM4kNiTfyGzHvbMWcEVl6cw1H56CD4zEBhhsMgoqL4h229Z1/+ZeZUZ3iw70I5IxZDLwDSzlzkcaOahvCJodDAv+KRwJ4P7iR8KQFW2AJHUiTyMQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XKcxhGNBvxdrXNqPqx8uk04qyjywdAcqNWz5K0T3DELBAJ4TiMIFZSEnn0GqcKAAxdax+4w/Yl3a4OJmscaHOjyYYOF08oX4DfdtlI8/DDwd7vQtUbfU62B6TU7SGr8ZQ1tpTxXov7WE6JQ+T6kuADLpRZ/z40I5UjB8UzWHEktA4zQUU7Iur7qNnAYqeVpVIUv5fHkhXZFWQxADURRaMuXSvJylSPmj69EVLC8dHP3MsrIB1b4JQSx82OHXsr4991S4kN/XyAtmYvO8xwBNR8i1MDpwQY8PAV6QA8i/O9m9hfVxVoH4Qva0QtbNxEJTkRyHitM/dhmdko0AA4uzqYc1e/Sfur67liag9aMM5mWIA9XSz4IO8VdHoZFyR528NULujHdX2lg6Gn8g6gzANlmtOk2t7w3BlHsuYUgXmEq35pswik0mlZiXgIvt8gzpgJRc8Yggi4k5SO8T4Z7CcxvZ/63t521+FF+YO7d2i0ke6wmM0xMxL7OUSoDCr0o+g9EOIbNSQfDSDEWTi3EqVU3+3FhThgkpcQ77AQTWw0+0r8IhRtEvgITc18BI3opFujIMjH8bBKrkhEQQwZeEBQFkLL2hzjaRPopedloUV91QHhNT4GGQTT6kKyAapOAH3vUfVxKs6EC2GfbCYNfqXcDT9YlqJpX+Nbe2juH/ne/YL/pPq8GUWTyZBKhOy7CwvWk6qERq4/xJsMGe22AIKQxQRuN8+kr+nT8ve94hwB6s2ahUUI0uGj+rPqGylmWNM5DhYtEVcIsZrh/dkuquptbO3SkiyBwavxrrJP55JImgQvqt/V7jBi+MSgxkXXMS3jVLmIJzpNKrZRsXLMipxmYKymKQX7cdJm1fMRRKrI7HKcX8zGghadpdxGJmrJG8eujxX4edsFmN0q0pmzQMtRBjvRI0xHoHimguSEbOk/AFAMklIgfNTo2nWmF0Ej38NsVWU2wIKEgJRhpGTLISWw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f82e895f-ae48-4143-3fad-08d9eaf705dd 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:34:52.8342 (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: AM6PR03MB5880 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/cavsdec: Fix error message 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: Qrm0DfFP8sX9 Signed-off-by: Andreas Rheinhardt --- libavcodec/cavsdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index da9aa94deb..6f4856ce97 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -505,7 +505,7 @@ static inline int get_ue_code(GetBitContext *gb, int order) { unsigned ret = get_ue_golomb(gb); if (ret >= ((1U<<31)>>order)) { - av_log(NULL, AV_LOG_ERROR, "get_ue_code: value too larger\n"); + av_log(NULL, AV_LOG_ERROR, "get_ue_code: value too large\n"); return AVERROR_INVALIDDATA; } if (order) {