From patchwork Tue Oct 18 13:29:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38797 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2107036pzb; Tue, 18 Oct 2022 06:30:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4BYc5GiZSMMK/oaZHSNujaZKIcM/m5CJCu7XENv5yLsdo9eDwCmYyszoP2xpVj6OVYAvwF X-Received: by 2002:a17:907:3da2:b0:78d:3b45:11d9 with SMTP id he34-20020a1709073da200b0078d3b4511d9mr2440258ejc.87.1666099810865; Tue, 18 Oct 2022 06:30:10 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ko1-20020a170907986100b00782a5657512si11014726ejc.416.2022.10.18.06.30.09; Tue, 18 Oct 2022 06:30:10 -0700 (PDT) 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=a7vTqMUB; 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 55E0968BD2B; Tue, 18 Oct 2022 16:30:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067032.outbound.protection.outlook.com [40.92.67.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3A0A68BB19 for ; Tue, 18 Oct 2022 16:29:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c/QkZNexKo+CpheELZ78+KSUqvsdrJFRo0rDtWTrs0UDjU+bwYLvGZ5SfxiH0VSRAao4Gv4j9RvZaChNjvcQHQQXTg+lmw+rP2Ipu12/Kj092QtJZK/MsDVC3ECjdiuLkDNg3Jfye+vQfx57IK6mQL2TcJJS0Rc6tIbHzUYrBvtPwlgfX8PxiwjPV71cq4HBuvUwMULum0NHUuOfGFjjZnbiylxXD9XlABS4/orzYd+se/6+Twa7i3BVx9O0PjQwAMvfTF5wfQZHa/JTyDhkpN2mN7zhGCg1HKRH+KhK61/RlKOrKZtblzp0HG9P3cv7/MZL2gNx2aLICRrcoU1GAA== 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=uDc4rDpRlfYRiI7o9okAi6EJhLCQi6WvbF+fbQEp4Uo=; b=J1kXyuvzmaMpTmklw/PtsRLc16u9AY4tW6fT6H/xZnPH6gXfjQNPcSmP6YdTvhWlsl/EvU7q8NKw67o1g6ua1JTdHQz2W8Z+baT1xr+2J/zUq8BPa6ANQODcFQjS7P/JAaqJ0O6gxzjOjw60Gty+P9mn71lFwvjdYn7aCEJ5wj34XC5EzF+Bj7hM52gveMwpsF08OYccx7hygHRhSQE7vh4FgY2K87N5p+CKUgXcnzOShcBCfZLW2wdRVZJS2MUljQuP1jLJFdT4pO6lythOIasrQkufJXRpYIFjFbb9AhJilL2WzAZITUDZY7XiJRbnyMmdSm6h9yKbprsoH4GiBw== 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=uDc4rDpRlfYRiI7o9okAi6EJhLCQi6WvbF+fbQEp4Uo=; b=a7vTqMUBpnBRZSYdqTZnB9sUBLiiQBFVmLGtHxDVtXicrvyxbyWk4FdNYly/lb97XBQLf193C0ohswJJigS2/JWHX6mKmQLOztkU5Qi0HYMENXFlcNm3YTY+BKe9ptnYvpZ2g6ogXLM2LjoKMT4WDON3E0BG0+T+HbgKxzm3QbS8T9o19Ei0oav9JgWiQ0RQR+EWaSKJL56VzYaJVt20VpyOq9HhwlXhpS+/eD7UMFynlxgL5V4FL4yQSAtZYw6NlWoZzMfJfywpkF4TcGTqr64vITkAH6ReIwt8dlfEQTtvc2i0ZxXP+fuqtzNH2fVcMznluBg5GwFtPtmRWMcyVw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS2P250MB0990.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:59a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Tue, 18 Oct 2022 13:29:57 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Tue, 18 Oct 2022 13:29:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 15:29:54 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [XfDXTTdoyVJIw8eL5/RTIpvkaT3pnG3+AruCGhC6RpA=] X-ClientProxiedBy: AS9PR06CA0326.eurprd06.prod.outlook.com (2603:10a6:20b:45b::34) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221018133001.313200-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS2P250MB0990:EE_ X-MS-Office365-Filtering-Correlation-Id: d7fa0c68-57d0-460c-e8ac-08dab10cd960 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kenBv2qQqPjO4Z0b+rcDBPHyNoGNVTB7/X++oIE7PGCldcZZoTSF7ZpK3ViAmoLuwwAVRnjzP8Sw2xVTTBXFY5Wl4kkF0gzChzL1jUlMW+vX8fkFqEdt9T1aSP+VQFjlimdfX62GcBuYfeLw4YUnCAqPOcpW6nVZe69DGiq04Bh9NQoYM4ZSt4awHRaplNDJ57Y0xOKluzteqfWQwrjkfv6WLSsPcaR6gd3psrHCFgUIrH0//oyQB2c7l80IyNCqfg1iKqzMsf1+gmUpYVRLHRegs770ha9C9WqZp9tHQ1XmV45KSqNQDrGISL6p37mA5t/fgBb26ZK1077+e71Sj4HPttZZg6Lm+xTqGqhlX4LijxDAY/mPOtx0LPwePyRuX7g48DfhErrwngKM7Mgtn8FCR9nhg4aahwdOjR/7v77butfwpmqRZ+yKXEfg0a//HbMme6lAxAC7RwyHI+0siL8mYur9RoNqknOtckiIPXp+REuRi/UYnxnJIFaPsPWpFtu0OqOco0nlqqkekwn8m8sEGEc0Es330C8ZX0mv0iw2vUzJECwA+EHQ92hMg2Dm623yuZ34sNOqonNVKESSh5OBem16uyFmxJLamSU50ZCcGW/a5cCYOOagyar+iog/rqX/tSdhXNhjygCiBZiDyGy0WWtY01bxwBhAMgCnEeFKo7nCyrr9hXi9IWN23qNX8lhzz5oBwm1OrS4rPA5Da6Sxb7kk5XRqptq6SOnjpvDDQJmnARQO0o8lcEjEDrO/5EDV1P2rLtX4kEW+XqqgJh X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tEcuuw6FHA7AreNHIkkT65PshRZwXkZtLYh3YwRHNIxV+vZOsH5jpto3ObD1hn6miZ9H1YODjoBxP1ajTrNWvlIP0pZulvd1tlpSGbt2MrL+Gv0lrX/sdoyUiYfRilKoFIHecw0rNIIZP0EuDeXszK9FpIDkKfUXqVhlJVodLEpGmYH9OpLP6hIIRbfkBYq5dckMGDRS+mBU7z7dyFs2aUuksRY9xdihYy4bcl+ziIrSzmWbMhe2BBvXT9TpUFatQJrN1ETBgJXEnoUwMWnCkRfkZ9RrUbLeV+ZTbMBIFIWvj8H5DXPEHlUePKBI1d+DXAfpGZP2w2SdLyNW7bRtLYVnI+dxfP8YFqw72b4k+ZjJsXHlrTc6mqlJkE1Bs14oy3S01zRA+tLfnny1uDHj1G3spC8+Tx0OYoKcbcs0RGtzi6zHlWlzx+KUNgOlLQGeEbUal+dRf/FywwulpFmiS6Gv9/kiepC+6h3jf0fKzsFOr6VCECm5q0gBj8PDs2u4CoAOv5dwQCE/RyzVEPkX75w120m+tfEQl9ZqMhVFceAEFreVZ/dbpMgjb4UkTsYw0L8AVtlTAWANHAXgjaKn0ru7zjF6xCyvfHBOVEsEfX9r+EehuBD1yq4BMlaazvne3QQnrqLBrUFtScSWniNvB2sA+XNedgdccwhXUQ465Y8f2wqH1l9aEo631ky4c7SO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: li+dLS42IyoBNgyYmYfS4OZeUVfJg3sNl445nYnV0ccfaEoHMjgc9Qoyy6Sfh5Ag1aOkM6zIpp+pE7cYeNxz2ODnDWs0EXCuA/EsnP++bgkpgjJQ+gMukVaD633+kxKcAJad9GYQbiki5Z2anrksb2Kk2mKe7Y9Ve1QU8xeTU+01EsS7Ovgz/O3o/WE6fD+LLD3u78IhRPNPGfvdYBlTCuc8bboabZ5r4VQj+7c5fx8bezB78jnNc3gSZYMG4UUM58BTryHDZtGPA/d+WquW4QZ/Ts0Y0J+xG6u3ORjgr1raJ41sV9B1isQ78Trhla64f58T9KX1H2d7n1tFtkgrGk8x15sAmhJvFNHeIXnqTIvyvRGhBuTis9miRtkssTOlCLTLLUsNWnj1in0QdoQg3B2rn/Zqrp7NyYhKJSKFpSetFAeGqilCIVMcZLib0vQ5p5GHE+KZ7mmWYhz1EuC75rMUON2WynzyA/0/PyWNRXQy1FhL8T/mlyCczZN2ihn27eEVorwOEN8rhwuoQOrcgMxtFBL+VePAXOhO1FRxyd4U6l0A1WzxJ/ZpRDlc4DV+SdyRqe+QyOrFEgW58PlYChTQjxz+7HsszR2jWOm9jMF5KyuuehBdW/0QnoZO91nj/ahQ2IuIj7E/OxfPKP1sETKtPQeVZune2h7BHtgSK+4t0qMA/Z1ZS1SqRW7Eidgei4vacG7B+Bk5PKU1dXHQx0Dza6g4KFHGNlTPe3+wKQqQZrwhqloFhF17sYSFHivfMLLpicJw5RVsu+UiVlGD33dRKm2zoG02f1ywRewF5d0EipOMJk7YzfY0fyfE3iSdh/2A/HmH9pxbGdcXem5cpux6iq5eVvIsXWOpRrvMvJz9tRA+5+xOGJBKsaBYXpX0pVGVo8MT6HNWjHFlOWPxwq71POgKUGYnKkzyi2gUW8CfH+uDDprtC8kCgY/AHdyz1cogURk3OCDBLFmolz2pkkCuVqpmwxqr8tFTwbgppOXdmdZs6pYeDhLzSebhH3hd6JvDDj8dfJ2+yxeKFzhybZ/fNN1HaLfEC0y34UMLdXztu7gLDk5qVI3fE6q2c8Y001jDiM+j77+v5eCChIzfpihhtoFqbOePsI2326NCniCgHHTEuPEAN5JfvAC9UXCklp3toXCn9yEP223cxLx2pFYq2PAtXLinNpyHyEvzMEe6yk9roKH2RFgUnRjpGrb50xxevTOawhz9Z4lhexm8NmAiOsnCA4yUfjxcsUWkVduqiN883MKBSuLq1gqeSvO2wf57Th81wX56QHSeDg+q4P/KftmfDDq2RFV6ZbXx7Eiz2EOBPj5M+TRS5BH5LxrW X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7fa0c68-57d0-460c-e8ac-08dab10cd960 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 13:29:57.3420 (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: AS2P250MB0990 Subject: [FFmpeg-devel] [PATCH 1/8] avformat/mj2kdec: Remove always-true #if CONFIG_MJPEG_2000_DEMUXER 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: 5ohwgyVNdMTQ This file is built iff the MJPEG 2000 demuxer is enabled. Signed-off-by: Andreas Rheinhardt --- libavformat/mj2kdec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/mj2kdec.c b/libavformat/mj2kdec.c index 2373f31b94..63c3e8a391 100644 --- a/libavformat/mj2kdec.c +++ b/libavformat/mj2kdec.c @@ -19,13 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config_components.h" - #include "libavutil/intreadwrite.h" #include "avformat.h" #include "rawdec.h" -#if CONFIG_MJPEG_2000_DEMUXER static int mjpeg2000_probe(const AVProbeData *p) { const uint8_t *b = p->buf; @@ -53,4 +50,3 @@ static int mjpeg2000_probe(const AVProbeData *p) return 0; } FF_DEF_RAWVIDEO_DEMUXER2(mjpeg_2000, "raw MJPEG 2000 video", mjpeg2000_probe, "j2k", AV_CODEC_ID_JPEG2000, AVFMT_GENERIC_INDEX|AVFMT_NOTIMESTAMPS) -#endif From patchwork Tue Oct 18 13:31:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38798 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2107747pzb; Tue, 18 Oct 2022 06:31:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6eBp0/r+ifH/Ajyvwk0ayu45ojR0d+kEY31jxF0eXkwnTl6vaNZTLgaeANIq7gXWBGAlZg X-Received: by 2002:a17:906:9be2:b0:78d:957d:9efa with SMTP id de34-20020a1709069be200b0078d957d9efamr2390254ejc.411.1666099891970; Tue, 18 Oct 2022 06:31:31 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id js4-20020a17090797c400b0078db70cc9b8si12995805ejc.606.2022.10.18.06.31.31; Tue, 18 Oct 2022 06:31:31 -0700 (PDT) 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=aUxVkY7Q; 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 760FA68BD68; Tue, 18 Oct 2022 16:31:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073074.outbound.protection.outlook.com [40.92.73.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 945AB68BD00 for ; Tue, 18 Oct 2022 16:31:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NzOqfp0WOgkPpi5HUzJi5PAx+zhWsmM+MI7azhYpKnYDM/N/cZW7EGyjdIBMwvRei7gWP9qRnUDhfCRQC0YgGklMPGtJcrLBjZ1v1lD9VP0fFQljhhTO6+doGwMRFS/3dWCnKg8SwNjry5a7YGX52NaHRs/UzvbDmprcF4aLC2JWnCkHKo03UBH9rsbr5pxfke0n1SYfX9Y1gwivFVO5UkxweWFZhzxhBTxlJnyEQHVJJO8A3wS7Vn4+s9qkfX/G4bzqHbAQvUD91zZ2zqOENLcNd7z9ScILh8tCfIw9JJxUeFIfQPTRViGnISlTBTL6cCLXS38DQGO0RcEaYL1KBQ== 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=oGqsbqdYpcoVpOPuiBTYyLY6q+kh3zBswcP79LRahWE=; b=nWoAYX0f/cyzSjK6akNgjxG7Xn5UGLvUPHEYkY+8b8btKwQ9kTsTRNVHBh258yEjxhvqvnztNV1d8wG025q3uAlSby4Pk5D5zeMUMUyWlS5OGhBczYeKi7CiOk64ht7ZfvxY1kgqjw/HDk7twBpKoAL83hoR1qBCmnZpe7SNxNyhdTWB2GG1rOQx6VBkmTb1sIQOI2yT4xsVaPf6f6NHQj4j16Uwak5eSsyZ22St//0TeG03R6B/rB3Da8wzBvtaQKsrHSZXU2ObUDIWNt4n8dsON9dfr/OzhrUx+WG2SyZz02Zy94HSTNohUMT296M04yd77SvBdb8U0WyVJ9zeFg== 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=oGqsbqdYpcoVpOPuiBTYyLY6q+kh3zBswcP79LRahWE=; b=aUxVkY7QosyF6SQ2hrYBxPnbsVLdguCSQinJv46kImrXSvyXDWDRA5fiJoaPkMk8g3EKVrS293RhzlZlZdQyIzn7cg6ZxJMPUX9uZVOVgJayiacNAmkvKfM2eaylvzD4/zI/BoOzeESEx1nbTPQTUmyD/+14y9TY+FzCPae5DkZjUWrFnMuhaT/AwgwZn+Um1F5+qqEJpixm/xcuEOuebqxmqTsuOYRNDt4dwINxdRiPzbtBWv+jgbpx/QxgyNc4XLA+WIGGfrtSi6B7d1qVJpQC2M8CPHf9X1WiuGV6YDXprSy8B+Ww6XBYzch0K3T2D2DJC3KUPHavsG6b2Ohxhg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS2P250MB0990.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:59a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Tue, 18 Oct 2022 13:31:22 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Tue, 18 Oct 2022 13:31:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 15:31:20 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [tIKGcT6TdIgrssUMIyzMNa/ikO524mZ31GkgqSQeFfc=] X-ClientProxiedBy: FR3P281CA0013.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221018133126.313251-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS2P250MB0990:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a5cb68b-eaf6-4552-742a-08dab10d0bd1 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kenBv2qQqPjO4Z0b+rcDBPAf4hV1nW5tj9LAa2QykaSMtioJ5F8uvfgUtr05K8sqMkrqGT/rOw828ZcbwK33WTItDYtcVcxYwyEIHj046zR2xlmxlXiY938/b7zkywyv4YqHO1MF0NOBjL3GqVDzdEz+jOj7MzpDOluLzijo7fhNQc/FXtlTxrXM3VUjlnHBrJ4MkhxXBpsdNo+gqCQGZyBcZmFGzDwBTboh0v+PafqGFhUrZ2O5d9L/YyDtTSJOFe/KvqN7iY8gP2BnMiAEqty2CH1RSgGKQPfMFP0wdMJvogGV3XvJp1YliQuOq/mQC3ip/Ed9g0/dRnrxINcZ5m7mxVNj4VlITK5j+BWrhlKelhIf+aPdjziehqqwVlPYTXZ33VgGivrfNBrays40YQLLGXwCRslIzxQoh4/Ied1a102o8VBt7L6szqMbuIdjyUDPKm+gJAEZxUvlb+R88UGyJO1CX0fbAXYY8m5KMjKr9pqsnwSuZ+DHdQoDJtKIEyGPLxP51UWYDdQtqYm1kNdAKOP3ai8Ehj0+zQhFMyAcdQ7UUt6GV8oIzAFXs3gPMnEp2rmG2ZY1kImUWxITc+3MB35s4c5DfifBjicESJKoEBK3u17in7h7+oFKyRyttm6HJGWsOvTyRn7DadKLSFOI0ZP/1/3kfGCGIvPLzNC4yvM3M3se6kwzpwy8fDRXElLp0k2q6IqaxpBRn7iXT3wxkdyHMJ1AsfrTlyVIp3moLrNa5atU/eMy37adVCyQV/onxecRIi++XvV8sg5rph X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /Q/NAIKZ7ZNOChA+rr5dC9DR/7Q+PHWsWphu/0j+bZyZ2XwOtlSDrKmKdxhtOVEu83iyt9PjJb3QSep1++6kc72AxcG0ex/vOIyTK+BS1M05r4yBkC1l2ij218YY51D92rpWMvdQpuqD+3EFHfSE8sCc95so0Ovc/ARepqVV+J6+E5HH49QkqkC9cbm9uq849nqlSv3qk1JJx7rVDIr203o3Elj2BvaqMcqfff4Mj/qI5KgwAH468eA6u2OYk3gCf4xq458bo0o6IwaRrhODvyXhzjDg1f7GcMB4zzXh4fW8eulNJTMIvKykuIbBLEFZELPBUDoemgzHBws7x1HWC5l5E/JagNZe/Z0wM2S+TqQbPFPJNOVvUMd+3guxBbd3mAA1cG/KLSCv/dmfI9vR57YC4zslBEVmeiGWORwnar7T9WOk2ZDdaHME4kZjBjUyay+0bW9ZRqlZLYseWDWHsMKov8R3uPojZBQngNTq7DTqnTrnf5z9eGE2FfTGYbrBUiqKJ4aIbONg9OHj50d2MRwvtnlmINSXYgnMwkMhnjezQtx8vu3eSD+3LOJou+RYE1rtphQbLhPuONBoYAumedUPWG0CEHb/Q70iWi8+65G3TdsQZkDAjr0py8KQTsDZ3c50ebMFE6UJ46n9cU8UF+z2Q+8B7QxaKZERWc9CUemeQyzO6G8LbNLtjyhpKJNY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QH2R8u6aqhLuXM828VJbBueuZ9NOZHwvNOJWAvJLKlPTNdiWE8sbF9iFLqdpGEUjLpRI/XcVIw2L0XmBI/y/5d10OVcRjpzpzDX/kyJAMIB3ZWwoY37Yl0c7E1idxQulmpD0lOHnPZSrvWOrVQQFlgmBetOHs6jrUeKBE9/HNHA5GAqF7kfqp87fSwDwY69b/k500hEOeyiF1S+sbZyekDbg0kWqBqQnjx4osQE3qN6ZFLJkEmDaoHA+Q2xVUsWTjQANPGE7LQZhJkFJQwwlazCoviHUX22JBACH5dnDKdRBs6o4hdXd5zEqV2hQzPEY7hMT9eT83WNEfDhsDC/OhPlpV8X8XADIxq1T9aFkze12kGQto7WwW/nbEA8sPJh2bMjcCkIrNPMVJgwopSsDIGOShgMWHmd9IiiaKxSIkQve+WrXM1FawUpYSEnxntIpVopacgTkJPaCMXEAeE5NVwp24LohMyg/q8j3suF0poh+gtb3CnINWp1jUhom/Ip8zVTSJ7YF8gslUsU6hcEXr9j9YKweB3kpcOaisbWBakroq3GJx9OghTbvlw3p1Oh2zDXSHRPY982dx56V2mzRFd4qI/jVTFXhZBhNaknVBaDV0mcMwEzEYa0Y5Rlr7XpaTC4fyvs/x5H+k+BcwPZNytD4AmZU6HK9TEi7QFsXkyKUnCp/P7YkhpJhLafds46uJzhBHbnBOKeRw5zkZQ2rNPZG2omjWN91Q1jt6o2F9gNbQLyDa4KP4DMGE9gb8qRoSNTnTbm/Zw7dqMw9NvSwGwZag1hrzHOkKCx2jTIroBsEvbo7Q15k0S4SkZdjQL6v3vm/eJoeoeHxXeelfK1hj9MlCmn4hTLLgMe+13deYlo2g8cbXnUgoX61JgPBR/q09jPuTT+yBsApB4SC51xgcQB7e2m3uQZyNvoZtp+FtQqsBTMBP/yQO8AAD8RKUR0Q6+ZkLPLtd814RJKfnJtZxbMvNccTywjPpuqzXeGDUAYZme0kaIkIIsVvHuhj7yA1jzDbw8JkN94vMwd+ph0qitw/0sbV+WTvNXmOvnRll9CyujvbxPyN2hzoSAZ4i8c41jXs2ZKPFc2Q3OgtWCbTvqYpNl4LUaicpJP4rxXwy0F15/iBy24nc1W7Z+m9Vr0QsQxWSWKb6hl+i1R5siILUuFtVC6XgE1L5hzPARMHjz9Fle1ILtqiBqQptTqG/TECM7Yx+vZDlWzJtWwG0WYmJ3qV5WRfq/0NNOl5kuehl++1P8aPNW1nThS5La+aO9vzhw1iEbiRiLQvbVRl6h0T2XsSIbwKA2cMe8veVCvfMSR3l40pJrmxSPMNb/1peGUy X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a5cb68b-eaf6-4552-742a-08dab10d0bd1 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 13:31:22.0125 (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: AS2P250MB0990 Subject: [FFmpeg-devel] [PATCH 2/8] avcodec/speedhqenc: Remove always-true #if CONFIG_SPEEDHQ_ENCODER 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: 9PB/ct6Dj38A This file is built iff the SpeedHQ encoder is enabled. Signed-off-by: Andreas Rheinhardt --- libavcodec/speedhqenc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c index 4c1d76631b..527e63e602 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -27,8 +27,6 @@ * SpeedHQ encoder. */ -#include "config_components.h" - #include "libavutil/thread.h" #include "avcodec.h" @@ -280,7 +278,6 @@ int ff_speedhq_mb_y_order_to_mb(int mb_y_order, int mb_height, int *first_in_sli return mb_y_order * 4 + slice_num; } -#if CONFIG_SPEEDHQ_ENCODER const FFCodec ff_speedhq_encoder = { .p.name = "speedhq", CODEC_LONG_NAME("NewTek SpeedHQ"), @@ -297,4 +294,3 @@ const FFCodec ff_speedhq_encoder = { AV_PIX_FMT_NONE }, }; -#endif From patchwork Tue Oct 18 13:31:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38799 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2107871pzb; Tue, 18 Oct 2022 06:31:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Es82IwrK6Bu6PprAtct/qiVEdxKvm+hU5IliQnSN0h4sf7G/5JHLBDl4PFDWwqnCcyXBT X-Received: by 2002:a05:6402:51c9:b0:45d:5efe:d1a3 with SMTP id r9-20020a05640251c900b0045d5efed1a3mr2645002edd.58.1666099903326; Tue, 18 Oct 2022 06:31:43 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l26-20020a17090615da00b00741a18d4a5asi9388311ejd.994.2022.10.18.06.31.42; Tue, 18 Oct 2022 06:31:43 -0700 (PDT) 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=TLoe7zzW; 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 7D29D68BD83; Tue, 18 Oct 2022 16:31:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073077.outbound.protection.outlook.com [40.92.73.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D065868BD7A for ; Tue, 18 Oct 2022 16:31:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vvk0CFUEPNBWmuePbPBYyaB1I9NMA9LE0bSTpoL4sZZXjjHy/kGVBA1e8975+rKlm+/2GIE8TOncgXlkJ+GIR9S2FTBDPZpENhlIsKnAnyHJys8CMBldaPzC0QYMtBgAaeC0PGGBlghO6L6eIZsLBXRn+or5rV/IoBfnTnqjA+An3i8SQawcu+U7P4nUVHxhfLZaK4A99kwq30XfIo6UPd5mTVQ4c91s9/n+TUiJ7ppAHNZt6CgyKk41FYql7EFEN5F6z8eh04laqrG3Zf1P41Ru0PjRcdxVZC5e1kQs0mTOd2LRfUmKXssalhgkixAdZ9ds6fR9uEaIdUkTT7SCRw== 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=p/IO1GpBz9Zkd6644pJk7mrJO1SAZFXQR30m1oiO2dg=; b=WTD85/sldJS3txJNIWDFxIFNVjJdAYfzUlUIrEMbH7WAWx3GiTDxWHQo4Z1lrXN2JFKXKj/483Q8dDadEwKH5IR5384eMGOZKl8fDwpBT/Og52o2sssYkuQqeo8j5YksVJMWWKZnuFTReyaN2ZTSB9vi5S2BcxoDvVuIcKvq5QZj5DLzvApCkcUBAgMGohcrTf7IQFzD8aR8irWsH72kmwh5xRm9gSDm37kYSSYRsQ2l1apYCNuPnIQCAP+hCsgRuuew5RVvhHs1wfMqeUzrwK1JIhgKudgfInKRBRonzZNwW7u2Q6EZ9kLHXKEPn7MoElI73Bz9UHMDpPgXD+heLA== 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=p/IO1GpBz9Zkd6644pJk7mrJO1SAZFXQR30m1oiO2dg=; b=TLoe7zzWW262Z67kntZv7VtV/a/yAzouDz1v7gU9pSCTXPWSE5YQG6WU2bxDvEnG+CTb4ER7WJIOw5B2tNnKpNGro64JAbh4Fk++lJ4mYdt36Pg9M8UBq/SqFKxArhfkGRE8Pcs4fvXmdE6G/UAyvWjuGIQPubksNUQuACbMS35GLj6XxU3XAjf6LmBTXZcks1K7wb+Lcq3LhrU479u/EwbUwATfMPR9Et4FXWLEbTxbH2/XEenGLh7YJVED+GfGXEEaDURynCtTVAxdEPORoMowYYaBS+yuuLYyDjiEtaoK5GC96tcxOp3c2Or9YzE7N+cQt9pX5T3luX5IYw5ziA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS2P250MB0990.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:59a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Tue, 18 Oct 2022 13:31:32 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Tue, 18 Oct 2022 13:31:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 15:31:21 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [IKhldNzU9VJqTY44W2SOJNKhubPTZa3GTPgvHJTOdas=] X-ClientProxiedBy: FR3P281CA0013.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221018133126.313251-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS2P250MB0990:EE_ X-MS-Office365-Filtering-Correlation-Id: 893a5e08-1a7a-44e1-7df2-08dab10d1230 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kenBv2qQqPjO4Z0b+rcDBPsDOZWSmpbpIklXBmn8g3yG3UU5qBNDajhjSlKJsjQZg04uSBP61n6eHzQirchpvW8UehbuGZ0cOuJqBeHlodCuK1uyerwRachBXFAPkQLmzbXK2NmLWU2w4lLecnrszZXU2SnBp4M+zFydIEBVR5iXXTgb8iqxANoJ1K0MJl+PEal7zd1/PH9HOxqHhuzsiKGtZ74vEUi+MUKL3j4qX8DfTlEtFbxewZ6k5UK9ycKIKSFSnO6wr/VW1xfHyJVgYB9BnTa7MxVJZS28XW4mv1Qn4fTFXEXSEjQn9rPDg6Lse7abXXnVcjZZyNRujBz904VPxCbgYH+8UgeT90CcFCBk381MR0YYZVO/4OqQ3VOC+32kZ4gXzp1I8YPmOX5KyUwAVqw+zl0ItEsowBeh/lTTDcDfi5gIDtg1eIrRSVJ6oBWIE208B6OyTFhb9Hf8mA657FNxfkkj31MXpxDsDLSX0rtik71Ys/8qChKpvK0LFVHwWQpjhegLgRaGNHyVX3VPvB0DhOLVOMPeDjShLrqlbQLyOy+dmF34Fzd3Ipofbs1zZnwKhAsnsRKzs+j7lC+U6xZf7R485rsUMaL7hDdTJ2C00R+FHl69xIJ2kld1TbVd0AVmvc9+2lvLFkZcy94YysNGBKLE/WzIFVwjETplWZtLJsj9azX+1AJWtLFc+rxlwlvcSgwglLpljNWJHxv8aTPgaJZeFZ4OvOVPpmoy5Xf3/EWAjllDz0B7PcMv6KyvVhJJ4DZ8eKCId3pepF X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aCHkxAiNekn7V0EwWbwl+aYx8ynrPc/WneX2birRy1/OFY7IDmEiwNWwD0zTQl6Ca20mLfQXfgo3bGwLZGLdGW17HHFnu5CgqLnm6930iUSt7Orm8J3cMBgJhw2Qr/cDhKXMe0LXPW05z1PN0LY+WHHpYgItsmxBUvrv3GiP5CA3mYJJpxtQeYn3U3eSr26L7dpIiYon9QvjofXEC/tWehgWmb2IR7b4PhqhuXRnLAQKzpKN3Av+iis9yIgaLFLt6lBZOE+YJsW8ti3z8C+LzixxzAeZ2A9Xq+/ERKliSRoiZ0hKaEMEwDH4K8nl/BRaVvzKKoDvJCxl5aGinOK4eseGnXzYPWNYtiu7rSOoWvMdiqCbUp45UP2r1Z+nB0mzMg57qJ0Fnj0+9hq2G3fMZ701WlagYj1Tuhk9Cb9Nno5quCvqaKomahHpnE6Kt82CS4dixSg2m6iQMyJSlqjLvnPuCBdrymyFEg9GQpTySik5EoXMNKWlir+AB/a19UQVkhX7prDtTnXSGepApMwqIU+4Yu2hdJHVdWtMu3Yrpnp8ClSly0BoQ8uhUqoamtD1pPiNg1XOehBOcmYPpAe4E2cqEizD+9wuP4RA/da2UUrvfsX/xURRAgyrIBIA36l5eP2GkDnobmg4F84dtN9wyNQPQB6J+ZDJq7A0lyRnjvJctGYXZ7g30pTUywF8CEDb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 37H6wlfsCcACeTB6oJ1egBd05T4EVCxGTzLl96S5bBoVaZgx9hLGeC1VKGHU1DFnilMOO+WjGbH7ECHvMNc7PbqLKBBs8th0QsGLnj6n7vqRFYle4cP3UYRXy1KqLydglhNrUDmb0xYZy1l2v7bi+UUDri6+2nUGEyFnV99b71XkYaCkrR1De/3WNK5V6t0CsH+6EnbiMKx8kA//Qnl4RjtW0lxyH8+48qIQ7cY7MuI94J7xlSxcKJiAlTAyI5iSzXIb7JQvbabLPKzv7Guj2akejL1JP/vn7S0IN/XKb9ytGHH3WsFTtIwjO9vFc1ogHFlfZWUh4kgDI+Bxd2dsh8XoDqSE143WuEOFKVRSbE09bOEOznhuuQPyCdQSg6GOXChmZmng66hTnF3pltouMEpl/LxNu0sSmc3mFDaQ/ReCsX14sh8nWQ+LVaPV0HMXkYmuzHG8QUAYuC4Ei5RvSKDuaee4M9jWR3VYs8pdfK4sYuO7KAO2FNKkfXWveHBKBLHvFuUCyQbWXDDMly841o9O3THm5Slln2drK7J+6humQADceMaoacDByzVTAKU70dwAj7IK2oTcH0E6yGujdaN6ywrls4eupBRz04STxXwPDfc3V3Dhc0XPsn2b/v0NJ7lTx0awQbK5xlDkireBnR81R9Svbr8QfvLkTona/o9UA1F+FoRHyzWJ/HRyHeC1gjZxYYNkFcdivbqAiLNK2kUFyJaqmIKTKFiezXkKKksR3JTCHDcQ902MN2cIZYe13TFXYTCjsFG3uxkHZRylzOqgD+99zhJfVpFBR0N309J+AU3US2XAe8jMNcFUW9dId1roMykwbp8DNY0jhJ7fN4L0Sa1Xlz1K0VVeqSImQVYOl/GyhPQ+Os8gZ0zX5XPZeuEsHAA6dLqe8mXNRccy5gl4PU/+QP+fL7FPLY63QilXiJUcdKy3MnUdpL3VbOyQMYw9fy5iLOFC4UA5BCEBWUpcdPcjGdDX2ydiYaJconlF0PG5A1Rts4vuJmkW/wbiRXQs9FQkRAdb9zkTRp5hAbjZJdmuhb8J019Brkx3NMtIuY+VqS8mmi3kWWvFJzh15rJwaHX8/umfZpWId7lyZWSDcXD5yska0S2k2+j935s34JV3/U1b/NBqsUB87BUDzZnfJwB4Cr7WC96FfMqrNkRZxMuf8nCbPw0C44yrtF1BCGTa49a8YypV/YH+NpYOjaQdQ1H2fJ+2yIZi8+WwghFDG2gKYO5K7DOtWg7cUm5SXxSd5EiXaXf42zC5k/7NI1UTJ8LjBIsmQmaEClgSzPpPEco8kNyMxMb2GcBlLQFRzaJhI7TaHy+N0DU3VZFa X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 893a5e08-1a7a-44e1-7df2-08dab10d1230 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 13:31:32.6393 (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: AS2P250MB0990 Subject: [FFmpeg-devel] [PATCH 3/8] avcodec/nvdec_mjpeg: Remove always-true #if CONFIG_MJPEG_NVDEC_HWACCEL 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: d6pp2csaM1YF This file is built iff said hwaccel is enabled. Signed-off-by: Andreas Rheinhardt --- libavcodec/nvdec_mjpeg.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/nvdec_mjpeg.c b/libavcodec/nvdec_mjpeg.c index 87f7a99a46..fce464c1f8 100644 --- a/libavcodec/nvdec_mjpeg.c +++ b/libavcodec/nvdec_mjpeg.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config_components.h" - #include "avcodec.h" #include "internal.h" #include "mjpegdec.h" @@ -71,7 +69,6 @@ static int nvdec_mjpeg_frame_params(AVCodecContext *avctx, return ff_nvdec_frame_params(avctx, hw_frames_ctx, 1, 0); } -#if CONFIG_MJPEG_NVDEC_HWACCEL AVHWAccel ff_mjpeg_nvdec_hwaccel = { .name = "mjpeg_nvdec", .type = AVMEDIA_TYPE_VIDEO, @@ -85,4 +82,3 @@ AVHWAccel ff_mjpeg_nvdec_hwaccel = { .uninit = ff_nvdec_decode_uninit, .priv_data_size = sizeof(NVDECContext), }; -#endif From patchwork Tue Oct 18 13:31:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38800 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2108018pzb; Tue, 18 Oct 2022 06:31:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5g+xrOPW+X9I6ydCmjjUTu4vOMdgDEq9CMxzjWBVhdEJO3waZIk9p7TzoxzDJw566GIPEv X-Received: by 2002:a17:906:5ac2:b0:78d:3358:7694 with SMTP id x2-20020a1709065ac200b0078d33587694mr2437825ejs.276.1666099915339; Tue, 18 Oct 2022 06:31:55 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hr15-20020a1709073f8f00b0078dd12d0a9bsi11464640ejc.875.2022.10.18.06.31.54; Tue, 18 Oct 2022 06:31:55 -0700 (PDT) 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=dk67q4cv; 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 8814E68BDA0; Tue, 18 Oct 2022 16:31:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073051.outbound.protection.outlook.com [40.92.73.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5228468BD41 for ; Tue, 18 Oct 2022 16:31:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DwMoeDY70ldn7FFgIC0qJJcx7cd2O2+BOPfFzH5nkW2Lb83OPBCQN+M7CG5+H7RMwlgFKV9bnTUThGqtFAdeoK1WlKbzwoAY9B9D2KV1q6tb87PgXfYABtbDmy/r/P8rZ018HdQYf2fq+ffUBI1HSrm6Q8sohiW3/yga1sVD8P245XYS3VimHjErlWjYMVdOx5IZdznbWr/3VYHQHMCKqvcL73mj/pEFOVcQ+8HRan1Wh+4aMt49QWzFAcq+2hXscfbiY6a67W+x4BijqYtUuZwT4Kft2AhxvD2tXo2Zs/MvSTCbBk7Op63oqXwO16RU7yoBvm3SqIT7wyhl2AB1Pg== 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=wb7soeYPPYco2TfmxPdUbNmdD8h9YoRWmkrK4QZVpAw=; b=aJeEVrGDlh5OoH8WTSLl0tPdI6HSDultk1yFNOPFh8jwtUkGg8VscSBVfewuMTqH+4dz6RZ2MyKE8xIFlEDuBGtA6UbXYQtCcnTKuxyIf9zWYqS8t9QZLI69zRmNOLw3fdJ2dOjcjJE1VIz0eYSkJp0M28vy+ETCHK4CV+VPmtV3mCpgZnlCb6d0lkDoFezD1nVdv0bXdzYYD1xBJOaAb6LPUmfw2ccRXHdtgNGUilz72V7oUrxEfHe4yH93+3itlM5wL+hUBtutuXTSifA0qF3X7/WgE/cTUsK7T9kKAto5smAXigDbEAsV48y+zQCCqmb+8qugjNmJtTlbq18V0Q== 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=wb7soeYPPYco2TfmxPdUbNmdD8h9YoRWmkrK4QZVpAw=; b=dk67q4cvJjDpDNUPRze3YOv8uc3CLFS/vK+ccCX25zHA+haTK1MEnyi0YCbdVxXnryLIfp/EXUH2sVxm3BVVotooCnkk0J5mXMQdmdehxXz6cgNXdzSGV38Sc7yDzxuIWeADStPKg5UG1xhb/MW/93I41OpUZH8ki2yzQNSgGIMtAi2j9p+F3AvcCsZqEW1DgGsWCAjM+orziVwJtsYwuwACD61g+e0GaPmDupILlthWAnTWdydw/hTTGjsVDlCUehYIgCV4MkYMMIw/EjlaOCRJ6c2NW9YBAx/LqIwAUfrOetpM00BQKhpf0QuDWnGxuvy+oksykxfYpKTrarXJIQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DB4P250MB1005.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3f3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Tue, 18 Oct 2022 13:31:44 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Tue, 18 Oct 2022 13:31:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 15:31:23 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ydj4AvR6Lt4K7KrN4n5nIOZRuLzk5Z39I5AC5hklAMc=] X-ClientProxiedBy: FR3P281CA0013.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221018133126.313251-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DB4P250MB1005:EE_ X-MS-Office365-Filtering-Correlation-Id: 76cab651-6ec6-4d4f-697a-08dab10d1937 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoCHZv7nQ63qh6iSlZQCBKl06XMFtza6Ra0oXk45YxOQIM7NvG8+vFJViUMWlJW3JqfLqIq3eTQLkJFEE1CBiE8YpfWwlnVbgaDqeNyK/HSYDLhsxmX5iFkaJIqkY0RyeXDPtpvxCd4JB9Oez7cLLmMd30lFS36dsDX8vCitwlCnJP0TxUZFUB54cbn7NqRHmRomMhEjYgKQyC1uVM4H3fpAFqkPy046P+1Qpj2KLNnaKC7eh5buPKeDRaLSqWWMYAu0o4mpbsui0A2OejLhLWLjeYKI5pgNH++hq5IqDZ/smXhw6avG45LLDb1z1i3QC33fgMhXJxz6kSNcCvHgQhnhJmVuHrDhEhx1gwp0KoNdieNIrhbqHB0NGxbWKbT3TH+wCOAUFDXyI8ihFPPCelEjxX74xn2p8q8iSh7EEpJlOiJm6QIJFQIBnXSTlbU0cmzeHhNUripSh3bgMPT5wuzOBgdkSmb/PVNNUH4hDzcYNhBg1ixiEOZE9BFJKHhWidbNpWsjpzQIDU7szqW6V2ZNIcX4kUS0/U/L06hHA6N4dZVPdC597+GxGkoU/3fT2imJVC//vI939zC2eGV8fwJltu30T2QSwwbIZAgBJHCGCGxgRjoBauvtqtQTjvGRB0xFuOzD/6pu/IL6bSf4xCxLxrEaLIAaMhBaBhx7SZ22F6rNZ9nkK42WEYfBaqoKuUrrbOG4dN/E5eDR1e46UatQml4XqecVU4Sjt4vz1PepUjk50N6Uof+cXYkY5t3HUY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HddAoi3j+qm2iEf5px/gQ7WdUqrHH6Y27kaRmX0lT7rHxtzvrCwKM0UyvrzVPwnYty6TDm/fM++cO1Es9XHjEiIJNBNpoWr+uexkwjTmkAHMZJmfKQbs9D7aOSOGpbyZUEJNsJ/rwrr7OrJDjmQFkPEuOXz11RuwMrx6yfnCzNehCQkP61ZGO2f1ZoSlssq3/pXzENE5V88lvUKlgIbDGP/3a3WhhdVrRWNxSYNlMD7fZNPdxoyYqxpJOejZCcVPXbTSineBhN9nllwyEICsb0CrvE0qCd4/YI+W+6KdbjOcZeg2FhSg6UQZXFiUjqOqLN9fg3bjSR307zQ1ZV+E3XNnCtAvh+5Bpju+PqMmCc65yiA0SgQyajX7OMQtpZYOfu49QQIbkFYTEmREvw4PXs8Bov4AU+v78gfgVQSw2MWwKbfVKy72FdqOycAkI9/CHEz7QSjBbhWHPPQk5gNIk1+CQu6vXHH9uBMs3IKBh+cqUu4UWFIjD07YKqg0QO1oCJDDbPc3oin2aFcUqu465Cz57Em1XhumGEjrri3spZZFIN9eWsJ8KhpposviCItPGhYEp9BaFBjvi3b8HOh73AWnSlgw6P38lOzhN1SlV2pfhIgQcQhe5TLBC1QfXx+e0KPxXTuTixq5m5onimHe1VVU1UKGwKQ9AZdZIqX1kRjRmVznVZaSGzwNMPmuT/Pm X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8nz2HuMYGcokbixucrZIuWmCBbw3JILGxa3gyq8LYVCMBzjjz56w6/0E3//VaEcjwWJ3bt+zSuo2FqOjbj7lNLtlZEgXdvfk37P4Ddxlp5ml+1U1GuyHwB6RtKiixOapXmm/kxE9K4GuE63cn9t+BHmFjDOzKz35g3DKotvkZ1qY8I62gTiGG06TpPPUzpS23tenibgnrtSi3W5c54F11akzBqQclTWyblE8IfsMTctvh+RmjgsmvIRFvZVfWI6dd6L5MMwKBQZgYPpOEZKsptZo62IJzkfEATZtM4aGtZtPMBmrOm1Uj1bj3CzcBHgyJdYSZMn7bq36g5TYD7npRFCaCYx7Y/EVuMZIqg879NURaEW08qDh9bJuBev+LETAr9D3bL/GA4l6Ub7/S/gnfQvRaEDVZ02qOwjt77dbuhp9TAIPQUbR8Nrh6AlpGlVXjCziim6ijhimxb6RKviNoqwwtdLrmrUmhHY1w9IlCZuRrT55PyW2gOlLqdQEXoAuC9N6uxExhTwChNe8eXmeG9kmrYqaeJY4hYUAeEbvgx8pY7Jjy/MxXXYLUtjl41arLcDx0KsIUzhg6zeFCUwoYRxB7E6+3yDBMO6++8UKbUQum4L6841B7Rspe4T8rfQi138mgwvu7PY0DB8PdGWdZBDLt20SbSlQdZLh0J6cF565cQnxRb8YwnixTV1/vNLC/LVDMdHIzg4YlzSPjyO8tSIVo2SBzzzFGxa4uPbEtmjrrySjiAa2CpIJdspnuOBTY3yiuzSvOHmNjL/oJAr4VkDhXjIfxICGs9O4zv6Cp7E78RQmuXn0eCgI2NEIKstP76a8qfEMD0cgvu28ybFScTFnJpJwYIHaGtsPdhBBtdsG3sfjgUHMNAwIIAJRoFqXYihW1oYQ/NxyhRZeb3jie+QWKJXuN5409lUHJPHG9OrXkaxxvSklyd66QwSpxze/LfdAp2LDIgRY2Qljt4Q5EV8YZhM7GeOKK93OUmDgSkC1cW1FsDFFG/pOB1kFtFXehegwyFIM7+g35zOlE8NNuX3HJt86tdE1wge+MD9OBw3kAc1YOZ/iHq6eza5GJukolLgVkJqrKw6vNbFVNuTa1OhCwELCD87FQTyfTvGWxfyxAQeXTdUT2azYD0HwpNTUoOVz7zCy4pB43Fw909wcwVtvhR49CPVQ2grc+efzrIjdmCvO+dz7szSNbK51DPfA6VP0jpVfy94birPDFYwQgXp4BUC8g4NFm35gm6Hb+/ijfFzIWTd3lA441b9KbBmOf1YRR25BQVfX21gYDUTYkEMFjUCEQpgqcJOP7ZzuZLe+G5EVBqyev1Fclzgp96x0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76cab651-6ec6-4d4f-697a-08dab10d1937 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 13:31:44.3818 (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: DB4P250MB1005 Subject: [FFmpeg-devel] [PATCH 5/8] avcodec/cyuv: Remove useless private context 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: +kFxO/BDQkyi It just contains duplicates of values from AVCodecContext as well as an write-only pointer to said AVCodecContext. Signed-off-by: Andreas Rheinhardt --- libavcodec/cyuv.c | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index f233b362dc..0765f41ca3 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -37,22 +37,11 @@ #include "decode.h" #include "libavutil/internal.h" - -typedef struct CyuvDecodeContext { - AVCodecContext *avctx; - int width, height; -} CyuvDecodeContext; - static av_cold int cyuv_decode_init(AVCodecContext *avctx) { - CyuvDecodeContext *s = avctx->priv_data; - - s->avctx = avctx; - s->width = avctx->width; /* width needs to be divisible by 4 for this codec to work */ - if (s->width & 0x3) + if (avctx->width & 0x3) return AVERROR_INVALIDDATA; - s->height = avctx->height; return 0; } @@ -62,7 +51,6 @@ static int cyuv_decode_frame(AVCodecContext *avctx, AVFrame *frame, { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; - CyuvDecodeContext *s=avctx->priv_data; unsigned char *y_plane; unsigned char *u_plane; @@ -80,7 +68,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx, AVFrame *frame, int stream_ptr; unsigned char cur_byte; int pixel_groups; - int rawsize = s->height * FFALIGN(s->width,2) * 2; + int rawsize = avctx->height * FFALIGN(avctx->width,2) * 2; int ret; if (avctx->codec_id == AV_CODEC_ID_AURA) { @@ -91,13 +79,13 @@ static int cyuv_decode_frame(AVCodecContext *avctx, AVFrame *frame, * followed by (height) lines each with 3 bytes to represent groups * of 4 pixels. Thus, the total size of the buffer ought to be: * (3 * 16) + height * (width * 3 / 4) */ - if (buf_size == 48 + s->height * (s->width * 3 / 4)) { + if (buf_size == 48 + avctx->height * (avctx->width * 3 / 4)) { avctx->pix_fmt = AV_PIX_FMT_YUV411P; } else if(buf_size == rawsize ) { avctx->pix_fmt = AV_PIX_FMT_UYVY422; } else { av_log(avctx, AV_LOG_ERROR, "got a buffer with %d bytes when %d were expected\n", - buf_size, 48 + s->height * (s->width * 3 / 4)); + buf_size, 48 + avctx->height * (avctx->width * 3 / 4)); return AVERROR_INVALIDDATA; } @@ -112,8 +100,8 @@ static int cyuv_decode_frame(AVCodecContext *avctx, AVFrame *frame, v_plane = frame->data[2]; if (buf_size == rawsize) { - int linesize = FFALIGN(s->width,2) * 2; - y_plane += frame->linesize[0] * s->height; + int linesize = FFALIGN(avctx->width, 2) * 2; + y_plane += frame->linesize[0] * avctx->height; for (stream_ptr = 0; stream_ptr < rawsize; stream_ptr += linesize) { y_plane -= frame->linesize[0]; memcpy(y_plane, buf+stream_ptr, linesize); @@ -122,10 +110,10 @@ static int cyuv_decode_frame(AVCodecContext *avctx, AVFrame *frame, /* iterate through each line in the height */ for (y_ptr = 0, u_ptr = 0, v_ptr = 0; - y_ptr < (s->height * frame->linesize[0]); - y_ptr += frame->linesize[0] - s->width, - u_ptr += frame->linesize[1] - s->width / 4, - v_ptr += frame->linesize[2] - s->width / 4) { + y_ptr < (avctx->height * frame->linesize[0]); + y_ptr += frame->linesize[0] - avctx->width, + u_ptr += frame->linesize[1] - avctx->width / 4, + v_ptr += frame->linesize[2] - avctx->width / 4) { /* reset predictors */ cur_byte = buf[stream_ptr++]; @@ -144,7 +132,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx, AVFrame *frame, y_plane[y_ptr++] = y_pred; /* iterate through the remaining pixel groups (4 pixels/group) */ - pixel_groups = s->width / 4 - 1; + pixel_groups = avctx->width / 4 - 1; while (pixel_groups--) { cur_byte = buf[stream_ptr++]; @@ -180,7 +168,6 @@ const FFCodec ff_aura_decoder = { CODEC_LONG_NAME("Auravision AURA"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_AURA, - .priv_data_size = sizeof(CyuvDecodeContext), .init = cyuv_decode_init, FF_CODEC_DECODE_CB(cyuv_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, @@ -193,7 +180,6 @@ const FFCodec ff_cyuv_decoder = { CODEC_LONG_NAME("Creative YUV (CYUV)"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_CYUV, - .priv_data_size = sizeof(CyuvDecodeContext), .init = cyuv_decode_init, FF_CODEC_DECODE_CB(cyuv_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, From patchwork Tue Oct 18 13:31:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38802 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2108272pzb; Tue, 18 Oct 2022 06:32:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6UWx3iI9PoSi/5C+BqlS1V+92sKD2+yUcDJZBUjidzLD0cumK12dgpBdO3B5pDSUbDKIil X-Received: by 2002:aa7:c698:0:b0:458:8274:12ac with SMTP id n24-20020aa7c698000000b00458827412acmr2659625edq.351.1666099943857; Tue, 18 Oct 2022 06:32:23 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y18-20020a50e612000000b0045caa1628c6si11261641edm.216.2022.10.18.06.32.23; Tue, 18 Oct 2022 06:32:23 -0700 (PDT) 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=HsYrMuOz; 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 CAD8A68BD62; Tue, 18 Oct 2022 16:31:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073011.outbound.protection.outlook.com [40.92.73.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65FBC68BDA9 for ; Tue, 18 Oct 2022 16:31:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m1H8u7H9SSeeTHxVMuvPuTU6veaJQqyX29paE1OKscWYGz0PbyxA/UpAVAHeZFEPYL3lYpqJRpFXAHq7SKRJyhrw4MKJLxi5eZmhcyv9fWYeqNbx5IM5iNtwUGVqMUcvuvT5RQc0X2iVRyQH4JHHOHLe6khhT/cLcskw1OQ1DfbQcmqIDc+4b1UjiFW0iz2TR0pd0o+ut7WxDNzztnNz18rvmGZM9yT+wGc7QaSfcYR2kRIZ30PN32TLZ8mtkNd1md29XfIe034qbTSKomto2XZnPNjQAp/tNw3t5xA4V12yI17czcvKugi4B3gN9T1POTcazrMUQLylnIYPfbfQpA== 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=1KB/xzPVMkDrmC9eyySoOI0zCnD/HqtB0m5z4zAyA34=; b=hlVz1BINI408AfSTXVoj4XyZuW5W88WeWS7f4aDeinriwjYIHSe0xA6K2Eu/n2wT86qB4foVu6GN1f6LWZMWTa8dxiuqZCsvUU4D6HrqQd8rrF57DKK9AWtQtwJlYXeC8i9uagK3s5TYv13QBayrFaqlYeWSE3S/r5rlHOzElRXKAAkdvffMn3jWkTnN7LfwOY808o+cJ4XOFjJvmSOE/vvcxkO8vweMEKih7pPwQgAHq7hAGfxWIlHVCSrz/TNh/5baRvdNP3rvAlHsBPwRDB5B9A0ZtSV4+K4N9NJu/y3nKwSUBn+AdItS8Pe5sbTNu4sTCiQ2NO4d2iGfEHGEXw== 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=1KB/xzPVMkDrmC9eyySoOI0zCnD/HqtB0m5z4zAyA34=; b=HsYrMuOzksB/mepwQpluc8TscaG4Khmp3ascN0tAuHUQbxNZhD4SHO3uUonGBcLNt5hztcokA5HDK8lbw75Lpu/RvEw4gcW8ud598JUehxeONENcOSjEprmJzK7CXGqIQzwzumHAhU47S5JR1PH3Q7E4mSz61yQmUv5ahmFCUc1SU329QBwvWflAW3nl8dJbaoFPuIucyId+zK/tC24nZcaD73RQCOUTLnkO69GDegitTGA3xs2bX8IxsRHOKAoO+7i+5eWXuDHhI4t4MCwZ0b9P0sR07M4XZ9+RnZCEYhyWePftnVe7G4pVNMcus1tfXs0cx1sLbq1spTh05XhVgA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DB4P250MB1005.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3f3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Tue, 18 Oct 2022 13:31:45 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Tue, 18 Oct 2022 13:31:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 15:31:24 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [YWGqUQlndgy5cUkHbWZvMkKYC/yoqjctGCIAJNct+fQ=] X-ClientProxiedBy: FR3P281CA0013.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221018133126.313251-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DB4P250MB1005:EE_ X-MS-Office365-Filtering-Correlation-Id: 85e83419-8775-47b5-62a7-08dab10d19cb X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKyWK/3+84QDQBoTi7p2w6m6CJ+IcjkONt6WyYM7tWUll2WSFA1wrjvaUzYRUiNZIbmHRuAAXFfkF5ZeVLtzzF742KAu1B6FXRH/ehKuD+M8lzO0e37BsoKY4UOjuoYAVEXHcdPb06Yuv6Gxm0NLkEo2bXzxHbD1CtoXnCUiMAEnqORMzK+njmDw6citCPOFmzF/Fwb4QqF0Y0HxlH9iX12rUQGkrivy4THP2I/ZekhUWr1zcHQdYZf2f74mzMROvQaqlHf2ZikdMvWdhSByMWCAPzOJaTgWQjdvgE7cECODODoRoa4bZ0Cx1b8kXjwK2NSyWRCTqhEWKFbiRMaTDsi+sgNv3SrolwiVP4+FfTOdipmpbA9/1fCblIGZvpjM+mrgyj+V0QN+sVykbTu7KALFDe0il8UDMAmD1X8DUGr5RGgOyz8WN1pmdbHnAQPwRNaXEHfcLGDzrwwJNW5H9O9A4e3XZFkzkAUDxpP1mFDMsXrMrGd7H8ZXR2dubMoaFXTOGjM6r7gEOisxqL9hsc4ln5DV58AocctDhWFCrgUl5z1w/vGWuVmACxTU5h8KU0JCHn4wRFsCFDmOmgfhcsUyOo9h5n0LQAUyonuRJKQzxtmWFMRFQek+fcuVjWrma3LomlzDqowcrSfreMx/TDgFlz83IsiUv3tEbuegbBLeFuTm4G4bKpriBcTXxzFiG4uisvMghE/4WRKEHJdjHkBJmlIlpePlalE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S1NbulMmHpuLV/KMD/abs2PT4kW2cqvNo40+VjMr3e2gYyWQE4s6ZhhoVzBNvHr6Ct4gi84pyeD3VFCaALljNe0CjCDWMHI6M0d7VvfrBUq696r7IcUJymBBJPHZ9cetGQNaXdrN041ZImThYJPb3Tp3Jesg+lj7Szu1FdDHaEMaZN1iPemltUfI6Hhf9W3Z1CB6T0t9zgJDAvWkp+liXLL4oH1E9d/XO8jzvwLOtq+6QcKAZKjXmcL+RK0sHLx80Tv7/CXLUsffCT5SUTuGrbpowkQsGDZIQSo8UM2EnCvN+EJsc4sNMb282wjZMPVGPoKAUrPGqPKRZ+TOnGEmMRkuvSrMwHx839YU9hPNwHNplXQqR5m6v1ur/EGpvTlyJGRbx6+oxcJ6hl5Ph+YVPb0JdufL2vE4sRwXhgSX9QHLi/K0pAkyTIli2SHNVNY9JwlV4Qxqf+7056IdtGKHnZ+wzdlDdS8tVroz5Pwt0EOwZgZCNCbjlrC2yr8FqO/Oeh2zdQDGxSgv3M/i2giGVqAV4Coa7VDCV4mZujZVg+YlAnaOCKwrAmScc5NfgmfU+XHxPtD1XNP6lmG2EKbnsePQPGQtJm2f5r/AWkgRV2/Dvn+2ranVrhfAfY6odZ1NZ3d6z+EUHKWP6kxt4G6+nh12hloGz/IWoSXUbP0ShFy4muieuFJgK3JI6UIk0Sma X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DC0ZCIqjWIqdt0z5KObY4XpoNKrEqxMevYomsiD9nvAsL3k1GAO9lFIhvITRMSVZBfnzFSgFae0W4cWi1Z4Smapt0GTykwDU1ffUOvgCheIR9eEQ13cAjKdXJwg1bSm1ET2dhTNyBKNwJ1x99Bael+5ASp9nWSb6pqQsOCBR4hlTmvOeO4XzVCrDoSjrPUKATKYX52AuxWMiAG9BNscdiuqB/DL4ukId/UK42mKxcttmG43lkJI1t7zEv2KNGH1cVLsrAHuQiU/l0UYqwHCTg6CYb4ZjVxlJ5sRvWjAPHSZxe9IYobLXS8VVQB1XW0Ip58RzOLKq79LA77e8xslhOl1kAS/nNv1qLWBORuD61mgMFng5oGh7VklPHFy4HUkDo9xRXfH+x7kLt9JcxkRefHhdXg5LS/dXr3nSMT+hKE3O2gku3p32QELbMkaVF8Oo6x+suoIPgHOUjxbKH2IQAZhml97rU72iTPmGpIpOSWh9QQ6Jg7u17LqRajKdyO5CYhQytp5x0PXlT/tom3cRjdWDzTamKex0jEmDqhv+1/exWqgOtPZMl+JfUPaBzXMJzS4sIdQCyaRgkw+KpMGrAsOiU1wltTwlDMVE0B6B64BEv9ReGqxwripeoGxdJuJA80E8PvmTSE4YQX25O+Rpuy0qKN6BahO98HMMGhxlBsF/msfLitJvShrIiS+lq9Sy7G2Bih2fq5fd52YQ1prOQR2SN+GCuQt7dhulAWfEeWspK4JbjpTifDySqQxo9XCtJORCsk1UUhjvNu3GmsqEqHEpBCsSDOek9xRoP5WUDfOZhkZd/OQXMGsBSF4THRwLGgWcULeLFuGvxjD++wSJrCc7gWLXA6zG2Ima/VBZb0m8uUcMmNvfEy6FwsBA87zvrqmm2ub3KA5JqdTdzDu0iss1e1a3wUxmdO+EDsXvJYjUzD+4xqm9lwNDs39fCDfkNkOrLbJ/elpIB7JBYSKmWNRgMgM4bwPGPQcDw9eJwFb30n75PbvptSIi0KMXBwoIPg0jOlJWDIqnnsz8+Ac8U6+jjzjqWDigiBrSGGgb3BgZ9ZQzBrxghx99R5twyEv5t+5/axR7QhM8TGDFFFFwITDKkqCe8Y1hxCYnmkpG/xP9iDk6QRAxIaXrTkqLn/ZOBzCLQwxWCzX+/eKdqnxEdOoPdXV9bnQO6Y4sP8L4+WEvHESG5utCpJgeCUSs4nAuz00XGyPZzcWjRSCZtBm0EVyqKW2yqp8ilz5CRYPeyYhlDG5MYQJjFLPICOYGgWWGpdSG4d2acag4GaG4SDHJVqpqvNUf669d7wAu0EOzEZ1Q4XicN2jPw9aVSjECIhSw X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85e83419-8775-47b5-62a7-08dab10d19cb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 13:31:45.3983 (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: DB4P250MB1005 Subject: [FFmpeg-devel] [PATCH 6/8] avcodec/metasound: Remove always-false checks 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: Y4rzr68Rq/dI The number of channels that is checked here is automatically valid because it has just been set by us (based upon an entry in codec_props). Signed-off-by: Andreas Rheinhardt --- libavcodec/metasound.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c index c81337645c..6c4525c910 100644 --- a/libavcodec/metasound.c +++ b/libavcodec/metasound.c @@ -302,11 +302,6 @@ static av_cold int metasound_decode_init(AVCodecContext *avctx) props++; } - if (channels <= 0 || channels > TWINVQ_CHANNELS_MAX) { - av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %i\n", - channels); - return AVERROR_INVALIDDATA; - } av_channel_layout_uninit(&avctx->ch_layout); av_channel_layout_default(&avctx->ch_layout, channels); From patchwork Tue Oct 18 13:31:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38801 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2108191pzb; Tue, 18 Oct 2022 06:32:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6UTp9N1ti+FJRGw9G5cWHmr+vBbZBQLmlt48EvIYz8Pa2uSzLP7K/1n1JfOq1xJ3BO+7m3 X-Received: by 2002:a17:906:5587:b0:78d:b6b6:7872 with SMTP id y7-20020a170906558700b0078db6b67872mr2427084ejp.72.1666099934838; Tue, 18 Oct 2022 06:32:14 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g13-20020a056402090d00b00458b71488bdsi13791002edz.388.2022.10.18.06.32.14; Tue, 18 Oct 2022 06:32:14 -0700 (PDT) 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=b1foiK7L; 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 BB29868BDCC; Tue, 18 Oct 2022 16:31:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073011.outbound.protection.outlook.com [40.92.73.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 36D4268BD96 for ; Tue, 18 Oct 2022 16:31:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ecuGnUVqm8sA5lxyp0l/y/QXP1yg7QfbG/iWmc+w+HUuKBxJvArIaL0Dy4UVu+pyK4LcxadchRU/54b4GCVn2+z6lDv+XQ5DbgYEmfxtzAvh+FE6NJW2B2GEcNQ6NsCVFWWPzKj+A4epcZr3RD2mm+WxzzhXPqPmX+jzzY3ImjCc2BPx9XQ3q7lY7J9cjWOzmFGG4/Ta9NEZSCLj4e1MM6E+y6wHMqsIif6kZWgCmzk/2NQQ6LjF1dYdX/TTpiFlQPwuNQG56DkAN62nH1Qf8p5mBW8CWu5CajxVHkXjEt3aoxOOV1YzZXwFeMOWnvZKQ81aSoFazi7fzr1vhvr8aA== 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=U9wZyo5pxOEwnlv+TxX8V8wHCb2svqDKDjRB4Kq2F4A=; b=BXI6g3udg5V0NyU+DHt14shy2KUHnejMTUED4A60qe9XnRlj3OWXAJ0Hr0azQ+wT/6klFs7u+D0kzIXE9C9y706fN5HDxC6Dclj8rqoawHPV0YWYekTgyPL63FjHZBkXqhiBzThGp1P1x/RWV8NpGyMg+yaQtFpbSdpKTYdQgHWKpb4qzDVlC6OQEY3/JSq0h7tJGHjQGA/NZFxo5+JQZ3X8aIMzp1JegC1RbKFR5iKT3YSq/B0+src8OA8sdgGAwy5t6DgawDkOiB/MD2cZJIoI7s0uNCWmm7SBHjns8QIYyDAG4XNqDnwiWf6kloStH31qfUBT4lgWJcUyUWhPHg== 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=U9wZyo5pxOEwnlv+TxX8V8wHCb2svqDKDjRB4Kq2F4A=; b=b1foiK7LLdMnDo2qqLnbkIHmJMcXbeAwuWrG33scA5F0KcAxIa+jIj9nYSN6lFDXFtEpkPilVS02WtzNbFB4gYaHF911YIyilVQz20qRUrEjTCD+Hi/+KbedTDOlPyJasiG0apaDou+wIt6u5ziXKsfoW9h0jK5DpgRvc+bcfTQVEgNpwYfqeEERMnQnZAMRIwbNkd6YZ/XpBeBLCpSQcr/UoSjcdgrGfHVIqJmK7pjDYe/f2GqntE/PLamAjNfMp08vLJjwPoELHZieQZ3cO1svM/qm5aWc4VT4OUZQqMQISvEgIpOnb6VRYSEvHn178nz2Svlv2KOYFO4VMeo5Lw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DB4P250MB1005.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3f3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Tue, 18 Oct 2022 13:31:47 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Tue, 18 Oct 2022 13:31:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 15:31:26 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [LwRqbLB3JRXHHlwBeMPaAkjl+B04yQoOqX9RNBX2fXw=] X-ClientProxiedBy: FR3P281CA0013.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221018133126.313251-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DB4P250MB1005:EE_ X-MS-Office365-Filtering-Correlation-Id: 50b734aa-30f8-4c76-22be-08dab10d1ac3 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoCHZv7nQ63qh6iSlZQCBKlGRvnn0hT4ls++tPZbW96qpJLBn4kxJ5vsiBHKLSj0HJbhm4ZKmogWJkixRg/mA2IHPWNZUMLBYHhGORtLIAeQjVAhKW2XdhPAV7rOErSxS9GNaidqO++4US+LkAb/adBRxrQ3Q8DUKwDAm/qd418ajTyzyWUKBUexHkLN8L5a5sdnyxymilyygUvSE10/Y3ammiOon817BEBxos5SY7VJoSlktT8CzEVMbk8bLzrCZjNzggedo/4ndGCVdhu6fbiMv3kxKeBfiaQCNpFye90JAvNmm6RFe4QX0ZFTdqexZv8EJCWw+nn4gK9wwaW72enNJdtyUoE5Mm2wxNM6JZJXp2+Y015nz1S896J/e/dcv4QTQ1VFxMyNizfTDVSJJi2LnfICyNLj6W1qGrGn6Px+OttU8j2Nxe4bmgKsk8NiA5jktRTBmq7nHi8AQYpX7tl0KSXO6XLB34m/T154B5NQgYbm49/FnlsYoCmH3piY3fqziOt7lFs6dPHlQrC+GNDUY/9P8IaY8NYABIW0P5C359zpD/3z5KVEna0leZR4xxaPRToQSzpFGSgyUOgrtEeVnVbl8UmWR41hFxIKocgMRWN3MEbmbeQ5Jx5rJ0eLPSATbj4pItWtcCRdwUZ0VpWSXuet7nZBhy3PaogCeAKweO5uWMauTKnhMdMelfl9ZE4ezvu0MCchxxYPah0JBvIDorFSSiBjkwRknAcUL3EJwnyQvwNuv5SRQaA1HshCM4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XzQdfWTRFurrs/47i0UOgmI3dVdl8OYm5lKsySX5WpXPlLlN3kwfOzi9j9g1Rw36hHJYXZeBzvhrOpmZl8MF9UPRcaYtCRasOywVgbq781DzkKk7+M7NMU2Tm8F1MbebIl5ohnOaGWr3+UDGtwfRnf8sWsFPMUUwH1fqOl+xWmiDeRMmIbQiabAo22FnMoBfeEptN1ZaKx++61mOAJkyezaN/BJMP9TWkMK7P6QHCWG5pbnfDH+rJQzDMXC10a1WS+YQfDtrDClUDi3Kje5slcZzDUEeEKlbUL8Y7q/EkqTYqsH593WTC5jrOxwwlMgkiO1Q2bPNW5IykjsMSQ2x3ExIrJryrEj+xGHErdTkVvf9pqJfggLfzVid3qgWUWc4lOsA3oZHVZ78UokSkHlLihtLwPvR1UeJJgQktc2NdQtfmCz67rtpo/2guq5Pv0iazIAi1qFaFRtzuPQLkSU0EKeJ9i/AUCHwWlD1DmoShGs6WhDC9CO2N/uld8Vr1bWFE6ProPuYmbUA3DzNv7Ci37Q0yigLQ33NYS6DsTvYX/7KBial2dzBS8DbRTSwanacrw6/xXol0GpOUFU67DgLjfaekqQEkzor8FbeIWM4JVhqvo8WNPmYtGlGmnruXSyUfVv/W0stlIvv0DKIhVp4iFc++4Vu6gHFE1GOhw6V7fZvjC7gmdTq87PjZWSXgEhc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MJu47x72XJxUim8VqGVjTZVQPjXnSOHX+eZ7xXi8v+6GUhQ2VdWEBy0L10WaGhZMkByQNxhOGWDlY2zh6bCyZGxsaLKGymzwrKUeG5mOwlrdTW8Xsw4wZtU+4eZFTfNwJzaPt2QP7700Fim48abcVhP/dpNdann4OTVybNfGssgIsrMNs0VTpEZSyNOhulBIuu/S5/rXA3yYrcH2jLm1PFZT1oVKSL1DlDFhf7uYAQF6S1LKi3uqX6Q1GjG13TYIRr/ilYP0F3KKUWTg3oTAxYm4dWFG/FYnfaKZ6ufml9W845142RIEwP1p/wu9YfjNCYbTcKtvHR36c3Lrx/0/KUXx82cpbnO/5/pRL40nLYitRzC2oTAzntYG2Uxf/7JDli1wGwTMAOmnOcXRU7+cs/GynSxC8IYmUbIIFZruPB2h9L2lbw99QZx+ScuUoWK5yQVIR2XLTcum5mMbmqzCBsW88nCrw3/JSjnBEa9F8h3iFXPUfXf6kXamq1rpR+upc1BYhbaXkjuEzXlylOxP/6j9gz8OW4frvNTSOVQR8X89zg4gdmoFI/5dXSWjrpQz7bYzc0fDH+HxY9QudMyiZnzac46Fww9+2Bs8KG3yxpDN/OmWmV7v7KQ6cm+7/L2f1XbsrrhrtKJLFKJ6FHjhwZDzDwOFKNQ+oyf8inRdAmgdY47IDdIGON+1Qu0lgBHSYeN+tjLfON4XZBWAtYgZbcjLvvIa4iYwkBa5y2LgmTkhKk/w7A3CIxd8Ob1rQ7cwIUZTJJIynhYv6L760ne1MpQmVIcKcJVo9So7wZu9g/C7QClgZCSom+d+Iz83gX7KMYRujSUzYPVNp8y4kNidaALr5G3VHZrwqZFIfgndaJjGNpHSYB3cJGdCI9YIuSYcQM+exurII5n6sTnVJuKO4lod4KlM8ncqWNOHrN5eob3ZhQhwl/Uci4f3XYgp0HhUPgkbfD1k4+Kut5WPwQXhgaxKp7S2+CmOCTBb197E3wu8gx4JAzwsHPa7/1l9eyAM0z9S6uYEQWjmoqJ8FR/6xhEsrnKDYEpP+TwWYXkpr9QZKZP0Za3Fl5WbAkwe/LwU74yLjIURENnL4CZg4CiVnIpLMdvvqVv3/JnRudDra1x5uXC8vXT48t1/+5sKyKi2vE9C4KyHpMjs+tSsScSbw4PD7AREgX5hkTiyM4MoJHvadAYVsOWUjCCSxKZ3EnMZV6LzCQLKHN6udf4m5FfKhhMT4LMdnI4vsdJTjdT+eWdALqs+BOPfp0jK43iutAcXmVOcmicX57pOW2UvLHhPf35tUJkTyfINtUv27xOGZugdPgr9bTwdy+pZ+Qbsldv6 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50b734aa-30f8-4c76-22be-08dab10d1ac3 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 13:31:46.9932 (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: DB4P250MB1005 Subject: [FFmpeg-devel] [PATCH 8/8] avcodec/metasound: Remove unnecessary headers 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: yWaexKJenezz They are used in twinvq.c, not in metasound.c. Signed-off-by: Andreas Rheinhardt --- libavcodec/metasound.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c index 6c4525c910..f332316831 100644 --- a/libavcodec/metasound.c +++ b/libavcodec/metasound.c @@ -26,15 +26,11 @@ #include #include "libavutil/channel_layout.h" -#include "libavutil/float_dsp.h" #define BITSTREAM_READER_LE #include "avcodec.h" #include "codec_internal.h" -#include "fft.h" #include "get_bits.h" -#include "lsp.h" -#include "sinewin.h" #include "twinvq.h" #include "metasound_data.h" From patchwork Tue Oct 18 13:41:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38803 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2112589pzb; Tue, 18 Oct 2022 06:41:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7BTktJcVeqr+hevlF4o/rUtLyr0Pta2qlry2xcPW2hvI1jw8SqK3MYcOnNpO1xQ+KBNgJS X-Received: by 2002:a17:907:1c8e:b0:78d:fd24:a596 with SMTP id nb14-20020a1709071c8e00b0078dfd24a596mr2417791ejc.534.1666100502743; Tue, 18 Oct 2022 06:41:42 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hc12-20020a170907168c00b00741a089d344si13595429ejc.809.2022.10.18.06.41.42; Tue, 18 Oct 2022 06:41:42 -0700 (PDT) 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=rbBXYN51; 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 9EC3568BDA0; Tue, 18 Oct 2022 16:41:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074078.outbound.protection.outlook.com [40.92.74.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D37668BD89 for ; Tue, 18 Oct 2022 16:41:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YEDIlRXpWfgudizzagdjeuA3YGFNgkwaWgkKyd3zcx1ZOJiM6DQILV0mVTZrULexj8GoOVMmOkDXiQpIgu4kkLTX5RyeqQC+A6keKe8Ia0RSTzrNT9zo9jIHTKRtZofCrtfMwO0IBT9A1rLN0eqg75/Z/VNJxI78aS7pYjlrtS3/FUlzitAzOOX3Y10OgV8jcbhZeyR9/SnaOCzlh12P/EC/Jw1AFCPEN29THXd2Tcv8W7CSO6rRuh+AfEND30THa1e1bOue/Ktj4dFJoEc9nxsSa5aloxNjb06C7droWWdynQ3ZUHwmq8Dhc67R88Hdkl7fVlj07yHMloRDV9JliQ== 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=ajTj1ajL1fCd/mkRV5BaTsQ3hxttukFpUHpCYVFSSNk=; b=XUFk3uXUO9MyahqVLi0bjD6y4T1gSYt9w7p+GqKlVEoWT+2mW/axHKLLraQ/0tHaqg1CYcXEXJdxLmrBTv1SLmgAz+xxvXB4/ti7NHW52XqE/0Gw83xeJ3WJowr6yJx8qgbWNsJ6+QfUG3ppWVcOrx6x+VgvNJaS+pmeOGoIc36SwMHjbXnsrb7RdKOtmiyNCFfLIMfM//1UPHizDwH6zOltqscl6vbYU2e/mnZt7GANJ8xoTaCSdyrgXRXHhXXTJjrlWkb7AJViCbmt9e1ps7GwMkVFdPZMAt0sA7Luhx9TuMdMgnumWpUdX38JclJA6nwG4t9YvvVT7Zw/AvAv6w== 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=ajTj1ajL1fCd/mkRV5BaTsQ3hxttukFpUHpCYVFSSNk=; b=rbBXYN51fRAP9Jk62Z+uYjSZk34XgJuwn+L3Blik5Sgmz1zwVkHb7iulqIK0CURrVAJesPaonGBER3auSWZ/1MwZErE4ppKGul6Mbl5IRoguYP5c6uiqUFegF9cDdottuCCmpbWtwvmPCGVzvDuTXn9EMK5CsZVnAnl8OZNbVnLWud0WT+J4By7thh2T86wGWbqzvqc4U/iGYx8CVW9t48AOpYI+6U/Wh9/qd7/gL1v/VMpl+JxwmyOvPOIbc8khO/0YvyywOMng+RZTY6mlXyYfb17bZ6BE4vK+yAyMcjfxki/t14BLzmY15zI50zU60+8nirObWWlIaAOso5zI/A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0034.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Tue, 18 Oct 2022 13:41:31 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Tue, 18 Oct 2022 13:41:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 15:41:36 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [WIbl7bQNMzLQqsBg4dS6fJPzhYSPGOQ2sABrcfZ981w=] X-ClientProxiedBy: AS8PR04CA0062.eurprd04.prod.outlook.com (2603:10a6:20b:313::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221018134136.314045-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0034:EE_ X-MS-Office365-Filtering-Correlation-Id: d2b04242-0433-4f40-e8e3-08dab10e7765 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKyWK/3+84QDQBoTi7p2w6m6JH3P6xp3ts7WjzbZsW0TMbZbUnK44f7qVnr9ynccIWfYEDqlHn4eibNrUG3J+ZAp/FrJTZMgtv/TU35fzg9TlfGhkjS6aeXhf9ftMGxYgFJVju9xWNJhalW2j1tnfueBGu5vmzUuu4kwSvN4hcfXECdnKRNNVS6mMEfuxs5iGGwPmFTGRvmIPO904CAl5Ddya7aqRp9JA+BLG2gSOcDyxfCAjy4smevF0S/uDZEvm3e/vUMAJbWF15CuC9Ibt4sARhXfDm8FTDlpZenwCxbmvQUq0dAjkh81mv0zZHr2Iysj9IloBS2sTBEHrNZ3R8PMI4lIb1cODyE7Z8FfMKq6icJ2gruRqNRJEJG1oS1YGlwMY7VDPzK/Qe/c5GpGQTUiZwzX4/nql25XGRw/gINzCVBVOo2lHcoruhzgRGeTvWQWETof5gCQ/EFToQIrjam7VWkJ3RT9i+bi69oZgbcMFG7xTyEe32OfL2Wp9/nc81iXD435zzYJrZaxRBNwHqWW937EtTTLvIyEO23uwiBpY0Wjj1JVEfqrfIT8qDb4d2ulR+cadTmQrkVyLpkIStRzmAs9SExZJWSkNhyK3ct6cYsmbIZHpvc7phSIbV08NTubVZJ4St+DENGHo4HFUP3r88479IQKb7fOXwECfFYbk96qGvJqKb6nXvRxJr99+l+B+45XN/xvP2mEjIG+GiFZ+ZTxIDoYirE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wWZu5KCoFz7nVzofrreGOv9ozBQEUz3Pg/olagfh6sWXoCiZU6QXLYqobqHEdIdWAOCz/LSVH20JkojnCJZJKg8f+U0JMTSJRDVvdGXA/OzrLl96jUHoSMT7O76pNlac2s8kz+wXsOPfWQCkZCF7ZHNL2pXK25xGZoc86pSABeMKkzN8D7BqMJ4JXGOOUfk0Sd58nxywvjt13GYeUgW74/sq3hHFJHYKDuaAQLFrrnrGmY9hHq1vn2EjtQod8kweGbuw2da90urvGyAKOH+YJ+paAWT/iq3d92i287PiJwtuJ+6bhL7WjchBHhQdozYeaxgUNSbo4+1jMhDfEt0BFZ9VDe7pF/sAykU7i3W8ATi5OwgRxpsZYlATwYsAUbZh6/06subVbSdcr3eWCmRMpc55yMRI/8wY+XP7Fe5R9nqBJFJLPzQhlwLqyPjraLR3ztBUcj8r48rVUkKpxGiW6HbHjikYkR8iyfx+1t/4xNJ8zrsyi33EjfEObHV+my1SqN6VUdWVC4ouO5Yq6EoH1W0JRhRRj97IjRdQPmbJYXMmOpB4Ngwi2F3FB7pNnB+LWk7zAGzli4f1mCWLVN6UgzsJLHEaM8oF0OnGctGQeztxOXlfnaKsHHG02A7hclEUPo8OEWJ3LvDgWZoA/9Hf7N+jFpM2OMEiutmYDg1uQtznOjmhjB49VCYcQZ4IHmx7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Qg31alBR5Z3hlpkii5tUR/imbUR9Drsi8LUsfxcPXGtgqoYDxQCtZksAwg91rz9j0kGdFCaZsTF6eoihSEtMFVOZaHUobN/QNyWhGUl0Gf6AJCd6iE8/SjMvMbxd0jbX/jkQe7J0RvzpsK/fbfulFPv7vzf0aDG64x0sfubkWl/yg80IRhzt7VHb0hk5N930Eh1x4hnbn6OKR3rnP7UaTlP9eRVnTaZKOUBJ5mGFbxjKvbbxlI0WU+AxB2eOVECtXSdLn2sNf1j4gGpRE20IuDjcqXoBs0rXzOWX8PmSUl0lII6RugNzBa4iQC3FoLzJaRXjntG7Gw59KuOXDY051ve6zEmD6K4zabW+xlMAV0+cp7qPU2uQT/Qcr8h+d8OhNwlHNzmrT71ECvO7aUv/FsCRi8/d87ZYWALRajGRC/uRhFYAaaZur27O/ZvP8xmpyVAx8E+W5NVl3KIDNooyIJJ6xA17y/OkqrauYVvUyjcF/g2sE3vNxTRQahzGilx4zxnQqCs8yqTGKIBimG5BeOpUXjD24iy0pYviUJTEgCdur88DXso+DOcQWIpT7/oOmaFxqMvnvr0dCLB7an+3oWwKaW8jttHJASt6kcG4BF4vZiQc7GiQKWZt3JjH52qcUHZTW2GSU9BEz4gglJYAyCP3WNhMtGX4WhAgPZwWRjvqr40jRIyJeEJTDX3GrhhOwYBaFWzQNbTMWPwOklhTaeJ9Fi2QKkbJ07PXEr4OtP9tqnksy0BS2QhuaNS5uN2w1DXq2A6TSo6mJM4BTxKkPdppjBExL7WBTLwChCFwI89eJjHiaD7zXYYUt9WI7BzmYXsNaF7JPix+9aTQ51gMOcj8yuhW3b4dGEcQhDci2vj1oFWdgzJzeCqiG/T/w7WbmoN/+h2Vjr1mthB3kOkUwtdxILxiF6oO5zI+1VIDrNEmn0yICUjx9pRtwXkFexkskoTifra7z6iOG+09YTssZHL5FJvPHLgb/qJFs3rlzNNtuHBI0E2UjqUm6v56TiNlWKFlHT2Q26dtjWgh8zYhbwCJw+UhsGIvH/TJwJ24jtMdLJSOTh7tjx+7b8//LF20owCmPSAk9NxCKKSn3t4YZpRoZtKKLot6PSfqGBUX3bysunr8gOyQLasGNgI5XyYKjaTUbchiApL4tnH0LJDNx1xZgQANpnkAPNHueBb4drXWGTb4+q9yto3nfplxRgTj+DmwNf8upHD0nPanrBQPj5TxoL3dWzCQFyhsUQeRWn2leCH+7FgTjKCuyojVIVaI0jv5juJXUYroyAegqiIvhyHxpFc2/FAd7Z4/nhZ5W5s= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d2b04242-0433-4f40-e8e3-08dab10e7765 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 13:41:31.9047 (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: PR3P250MB0034 Subject: [FFmpeg-devel] [PATCH 9/9] avcodec/speedhqdec: Remove write-only AVCodecContext* 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: Prt/vnd8w8v4 Signed-off-by: Andreas Rheinhardt --- libavcodec/speedhqdec.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/speedhqdec.c b/libavcodec/speedhqdec.c index 4c3df2e93d..8771808f8b 100644 --- a/libavcodec/speedhqdec.c +++ b/libavcodec/speedhqdec.c @@ -51,7 +51,6 @@ #define ALPHA_VLC_BITS 5 typedef struct SHQContext { - AVCodecContext *avctx; BlockDSPContext bdsp; IDCTDSPContext idsp; ScanTable intra_scantable; @@ -574,8 +573,6 @@ static av_cold int speedhq_decode_init(AVCodecContext *avctx) static AVOnce init_once = AV_ONCE_INIT; SHQContext * const s = avctx->priv_data; - s->avctx = avctx; - ret = ff_thread_once(&init_once, speedhq_static_init); if (ret) return AVERROR_UNKNOWN;