From patchwork Mon Feb 14 18:41:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34284 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp5760329nkb; Mon, 14 Feb 2022 10:42:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJGGgxMx+XJZ4T79vnvhJXUyIEPMlicNT2z2TXGmXVKt1fVJ91gKXHmmhOnUBZXE9YB4dy X-Received: by 2002:a05:6402:f1b:: with SMTP id i27mr102718eda.275.1644864128755; Mon, 14 Feb 2022 10:42:08 -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 s26si1659574edx.522.2022.02.14.10.42.07; Mon, 14 Feb 2022 10:42:08 -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=mZS+Fib8; 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 673BC68B183; Mon, 14 Feb 2022 20:42:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074052.outbound.protection.outlook.com [40.92.74.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3EAB68A717 for ; Mon, 14 Feb 2022 20:41:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nVmkmhk2bQTnrBHh4rwPUq2AWoGvAZUbfM7wjvLOtjsuf74bU9NNppbcfmcD3v9is0EGU9DxUqXPFqImuUYgub5gZ3rxPI+A/YLmyZ7J1KkgONk6oqZEMtztrLEGZFBEmR0Kw/58JbsTBi02KQLbziJAx+WIrysLlKcf6w4M1VvIFwsmV7wqqwqLsFNuB/6ua+h6Imq4B7Us4l171/cLVDZBIECmNYD7U9pydoRGS66e10kuUK+SrozhS+fOgeSVBhYbUtXgwQeEm9UY3PyTwrDVksyGJN+pldcKkgLYNg1ESiGNo9so/EXpAuPl+zUHVH/L7r/kBUlsMjAykxX/YA== 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=SeXSJ3+RWyxg11Q1j/pWWuCsyh3UwJTVpkLAWq5YZLs=; b=kCnXfRI2NqJdwnmwgeAl4Y3LuVR6mUlcgjceXPM+jOmuH5hy1ea7qCG+pfz2P9iwItUG8yw3w4uCcKGI4VpDD233MeR21v0yDJ4rZ6XUlgVFFEVK6kjlOE0vJ+1Y9pLKyY/yMgbTDH1dokxCbyHypW3fk9YTdCoY11hRNI+QqpzLJZz43bss9h3NM1CrqWk2O0PWyjLJh8C27GxbRr2lRQCBcTL9xJ/5VYoHq2as46bzrKdeQfnR6pMIIaJaOoiV1T/0P+crzJHPTr2rcCVBTdKmSB9u0rl7jxGJ1nq1/Bh+oe8QGx+up1aB8CW6OBt6NQT5TyZGzCH90vU+tg54iQ== 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=SeXSJ3+RWyxg11Q1j/pWWuCsyh3UwJTVpkLAWq5YZLs=; b=mZS+Fib8CNrA5pGfUZVZCFHTg6eM8XsLorFafvgi9EcpJjsqL6R0mO1NIpiT82x0f3YHxSgnWTBEyvWFORjQ8tY6U7IJSXSntcDyEfzPXi5SG04WpOJFXGI6YTsYJNdkiaDbzRUUl4lNaFGj6Rx2HHMmxPOgd/PtSVLqAdWm8H31h72prU+1rlnjhcFrIB7ODOgdsl/h48DU+OAnmZyXGJOCKFGWkBw5Cx2XzQU43U8uh/v/UB9dSAP5Xuhqn5O4yNHtrT3WRwG8RaSviPk0DQqHvkzDJ20LQjzgsWj5B6uKPRoJfjtA44fIoTl4xuukS0QOsu27WBHzJEtExjYuog== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by VI1PR03MB3102.eurprd03.prod.outlook.com (2603:10a6:802:2e::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Mon, 14 Feb 2022 18:41:54 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::a114:1ab8:c6:582f]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::a114:1ab8:c6:582f%9]) with mapi id 15.20.4975.018; Mon, 14 Feb 2022 18:41:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Feb 2022 19:41:44 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [2t0VHOmwWmx5Ka4v1NRsO8g1h5TjSsXn] X-ClientProxiedBy: AM6P191CA0040.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:7f::17) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20220214184144.28624-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cfb095c2-bde0-4b1a-e956-08d9efe9ab7e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQOZh+132vAj8q1ItGCgZjXdz+kZDrx0V9OYKmHx7bi8/UbCTWvL2UAfGSL9XSXEvBNg91RWnOROOSO74U9Q31cdk8a5JuHX5VYewgbPo/hxjsr7pzwF8yZAaeIyRRax86AA7Xov0zlrrbcERQTFxV0eoz9zwZL/VCtO6fuxDq3u+kS3bLVeF0CmTzyeey5GzSxNgxGU4Y2DVXgm2kpke05cKVP3Mh/YyfDR2xWlwsTJThIanIGlwLK3CM1ZCeixIp0lGd2mBamzjRbb03vj0z5HbJdA8LGJHArQ1oaoWINkYE5X0XF8vo0hntQUFs9FPoS8bybRrPUJo4TRjs6ua6UWbiLS6HaYU1jYXard9CO1a1Fa+Ct7LaNk//aloMV87Zwb6oqo+AuhSOnQaxEveEQbaKghQOipmHOAST74pRKJHgNJUErAVDnlLJAzol5E7jOxed5T1L1z9Z2RTcwV8s54n05OToJRrnGNrBn7FmKQTqhCeZ6GeC3rzAh6NGg3ar2XPYc8+rmOC5NA8rKbNyNagGT6/bVQneWtnWRVQBn97iw8Dx9fa8QeXnrAUJrOSOJakyEUPW62hUFbkEtrJPBPrTJTUE4a+9Sgyd/KW9I1frvpfT5E4U117JLfLEEOubsvjqEP7X2teUzPRLxy2xIuYqW+uULwaqsTb60s5Td8+bB/d+rerhKV93J0xhoF564UoNwraFx9Sbi3S/CzQEAI0fxQLEjdOa5S8EuyVOjh+dy4U5+emkn+JNdCUYK+bw= X-MS-TrafficTypeDiagnostic: VI1PR03MB3102:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IjWG8ekvDASkGAgptakZftJwzmWIKfFPsz7afxLZm8wqSAkBcWv5k1hqml/Nvsv4ARy5hlMkbUtUVPfi1DaP11PHrTC7m8F5lSqA3NL5hqxtuZ8L74Dm5DCBKktbuVLQ0SjnMtSPyeEW8fJoamlbr+zprvMXoD7wyBfsPkGzjsHz6ygRxTVVBizLawfu69KdwFeAGSmxhDiMcF9ptQJPiDobBKoIqVXxYKBb4VUySORC0vFmMIzIxtISf2niulj5F1eZFodtEYLLnW9ty/d8NpImMExPLu0mt+OxPFfjS1se4kw4wVeAlf45ES51LojcJjWjCdKG/dWFXOvciEbqojxddVoU4DryVpLRMp3/fTZqZ8GU5CTWG0fSHPgVzuyMx4y9+VKaI+jLgfOfmsqh7UjfsgUpXQbe/bRqdGMqArn5l5co7eNrVB1W8KR8AUhQiD9t4BPX3X/EdJo8osukW9c4TdS/yfo98rzQL8+/GPe1fgUxxfBZgkpnY0yJI/tLBtFAZjowJOEchUpbBf9Q8i/rRy3TTBJpAVR5ZkMXQzgs0G2ozly+frLm/Qm6PuHGTwipG95DYSHJtYR+LLDwXw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PCIJtHd0+KZ99vMhAzU6ZDYsG/NEKejTZzTGC4NPIJScxvf7uWDd78pPWzQdl28uPTlR3phQuVNL7+naLfGMhfwVEbvd40/jt3Pli/tCHEg+22OOV8hzUuG7jkXCrTV+26xQW/Fg3ihd9JpKdhI474NBhIrFOwgdUNQfO3sX00X0eQAvXKYAepgu+pCN2PxRYMjYha3LT/Y8ioUP0/EhY34P9h/boQklBl++QpczGJvA1khXBud1wwlELXYk9Ixvav0G+zFRYphhzUVIJnpnpa7xbLO4tBwkLxllFib4W9+dMS/utNIf0Et8uuwpqhcoFe+kWNGVXOt2Ziio2OUvQxXtxfDwo5oLG5xnC+VO8o/KhYa/ULXMujHZziz7DJf/L0MOu5jVC4Na01wYD2dGoLGi7v8+a0YDjH7qmoXLteb1+6/mztgs5AdW/slT59IRLn4uxIwWgiR6A/h8sp74zTYjkPhX7UgWqYa03esCH3/inYy9vN0gBSUGCNxqwGNkP5EwlgEcuTi/AVMCnsvWC+2P1J7Z+r4KdCnuuEsqqwyLeSQC5jY1dscdi3s+HWSSewWVPdz3wuC8vDWQcgHESSr/xCqZf3KKJXfev+/tvddmDrpi5VGyDlWc8KhLaKwPunlPDrWncrZUJZzL+ZhmOQ89lsqjRM0APaHYc4p/HkaG3qmtTr4uD5ylMFoTT0XYT52foKNS1uwDECqRroViRNCsYUptZumY+OoQ5hSJTf8QlFhhwmbV+1IzK515tHhYYbfi5Eyx4HUHDjvJU0Dyd7t7h2MH8mBAwiuVwtQYP36Ve3O8AfBEYoMG30t9XJwrxsK843k+2fLm8fNIWLntQOQCt4y1Hc4gFP/Ob711SHx6n4sNK+rOWfv8os/fU24yPuIUN8PkSTea4DECjIPPz7uMmMy3oEbJXOPOyWiA8Gf1/4RgEzkUazjVxaUPL6bYubvuirxXoMQVbWpvr7MQHQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cfb095c2-bde0-4b1a-e956-08d9efe9ab7e X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 18:41:53.8743 (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: VI1PR03MB3102 Subject: [FFmpeg-devel] [PATCH] avutil/x86/emms: Don't unnecessarily include lavu/cpu.h 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: /w9BNINWmXE6 Only include it if it is needed, namely if __MMX__ is undefined. X86 is currently the only arch where lavu/cpu.h is basically automatically included (for internal development): #if ARCH_X86 is true, lavu/internal.h (which is basically included everywhere) includes lavu/x86/emms.h which can mask missing inclusions of lavu/cpu.h if the developer works on x86/x64. This has happened in 8e825ec3ab09d877f12dcf05d76902a8bb9c8b11 and also earlier (see 6d2365882f281f9452b31b91edb2e6a2d4f5ff08). By including said header only if necessary ordinary developer machines will behave like non-x86 arches, so that missing inclusions of cpu.h won't go unnoticed any more. Signed-off-by: Andreas Rheinhardt --- libavutil/x86/emms.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavutil/x86/emms.h b/libavutil/x86/emms.h index c21e34b451..8ceec110cf 100644 --- a/libavutil/x86/emms.h +++ b/libavutil/x86/emms.h @@ -21,11 +21,14 @@ #include "config.h" #include "libavutil/attributes.h" -#include "libavutil/cpu.h" void avpriv_emms_asm(void); #if HAVE_MMX_INLINE +#ifndef __MMX__ +#include "libavutil/cpu.h" +#endif + # define emms_c emms_c /** * Empty mmx state.