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