From patchwork Mon Jun 14 22:41:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28273 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3246937iol; Mon, 14 Jun 2021 15:42:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhxlpm5peg61322+iRWZvKKEpDAsP+G4v0GdrXZWL6pdyYyRAZ9kVRIvKPY1UufcayBSRn X-Received: by 2002:a17:906:998c:: with SMTP id af12mr17606726ejc.510.1623710548497; Mon, 14 Jun 2021 15:42:28 -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 d5si14302379edn.231.2021.06.14.15.42.28; Mon, 14 Jun 2021 15:42:28 -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=f4xeMv15; 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 43098689985; Tue, 15 Jun 2021 01:42:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2042.outbound.protection.outlook.com [40.92.51.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23A2868980E for ; Tue, 15 Jun 2021 01:41:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EgDou/rSmTXBcClsqZCYfGq05musxtKp/n5e9EpfUc6azlFoMVrNbNpGnqd295u8AHPD/L8Fuvqye8GodJsWFApUyXIMbiWJRwDCPmUJ/BL0hGN+1IDvMK5ZRe9MhS+6N75Wbht0gkJlwfY2nCpWpUp4KSpnXaK0YXXabYXBZ0F8KJweiQrf1D7C390YaBUUbVN9aEsqIH9Rw7x34i6ONjtaRu2k+wyBtfJCU+otiEY2RA76GvcRJhAe1tIcxTWCvrrqwZUjMAHS3A51KLFMKd1/sWJc+PxnQ86X+O9zhaYnAgPaqW0S7bd69CqUo0nGSXIB2yJFcu5bCO1CjSkKAA== 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-SenderADCheck; bh=4gW0YGwKYX0UoYnu2QqJc9IPu1kIN9jdkgXj9dX0Kw4=; b=eX0b2pzCk57EqSWBIAEsNbzH1NxDzA292CVlcbCylKpCyOQtExyoYHm88c1Xb8lbNaRb/3zk/XGSTXr3GGRljrYiFa/wvrA/+B4qO4uEJdjGNCs4d+9tCM3ZEFx4QCPdCyf5lZwHF/nGKhxwVb6WP/Lfri+uCc7tty8k2rvOV8uwpb19o8KNfN6Ump69Gucy3EeZAEfDACIO6rBNocH51x1vJs8TfhkKFQu9ToYVV5bygHnRWvvlQpRO1/KLk6m1CTxaZ6gfINKPFivEMhj103k1Gj5eXGA7kKQZpFBx1gjgHO2uEaUFECHn1FO3WcvmXnRTgBOQnCs5GofLHHcEOQ== 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=4gW0YGwKYX0UoYnu2QqJc9IPu1kIN9jdkgXj9dX0Kw4=; b=f4xeMv15ikAK23z+RzWWaellWlva+pJFp8YEW99GcRgiKL2z1WjhHD2mvUP6tA6vRhHw0Lu5D+56gXPKCAs9b7fakhw66iWKaNTWhONPYqsD6Kbv3zcE1i0zxBns8UJWYC/2RI43VKnCMRwS1Ly88hNNjsnqoP08Dtb0/nGLajXp4NvFM0ceMN7KnOZTO9mgoZeG//qpCC72xsNIJOroETPVxlRxbTnzb1YX/WDSrhVSj8nbFi+NY9Tx+SVtqlfIEy2CetG2kuD0shVuIZuj7LrsRqU0RsVSLNJwK/2lODyzdhnVMlwCfculb+QBOCmBTzqPNunBuTOyRse696M48Q== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::4d) by DB8EUR06HT177.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Mon, 14 Jun 2021 22:41:56 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Mon, 14 Jun 2021 22:41:56 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:3E9301F9F0F7E632E055C055908AC275F00BDF4B2021AFFB94D8136225927597; UpperCasedChecksum:5B82720B83F191088313DBD7096485F22DCA339A8730BFAF58347CC4006FC874; SizeAsReceived:7580; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4219.025; Mon, 14 Jun 2021 22:41:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:21 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [gdtx52wMSyxRO5sLedw4z9E4smv70rO5] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Mon, 14 Jun 2021 22:41:56 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 2df8c51c-493f-4a9d-1903-08d92f859d45 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS8u28ets82B/Gq5G20dnAwvDLlQaKQuvaXX/WiJPII/4s//QJ/szkr1/TQvmD6mQ4OIOwgeMKuoHRTpkbS7XrADeURjeSlp6rB1TrE0lDBkGbK0LdlUCAl5Rf+eD9XG3aWF8iPT16tD3ahfxzzEBHsIOgi+lWL7gK9D1l+eqfLXbU5DIDWTmuDR5OJdR8vGImEosGw5uq9y2oh2sY5CLf4zSKYtH+5rrtWo5udhAsoozhYP0fbcEGbsP6HHzRuMFFbtCrLbkdvsIEyJ60X/JIYd7x5020rqwPrmTce4hOQkXUwY8E5mQcuIfRob5ilmNPZNT5xqfmIBhdTCg7LfUjotH3oJWIDgGGIHXFyi7UU/LlWg2L3mc7iO3/C9E2gGhO/+5Rpsu1wVIumF94FfRxJBXzAmia5++FD/hWbj4hqcgfWjD/vprll2Fbg2Gdb1E4rQTQIwmP+UqPJY8kewMr8oQ963UhvvMKKvUtfHCYi2j+1Z7AB0jiSJvs62SaJXPEjD8BZY1n5uCmDdZkswmjuM1Y0tNcnUjNQL628kU9883IWj2/FgbRiOhTgY+SbKORhLvwKS2wIOB32HfWWp0ZDLwryWBgjRkpc2nJGjLJLhgglzQ6WEto2XWPPTmiXIUHQ26vdBcXHuGtmNKBV0vZJ9/Ks/uTO9D/xGM4lWMxgIrUDJ3YPk+8J9PY79/sqRlEWekfctaelPmsehJVul8bqJwcTJNq/Dd0/e98nMVPjDGZNTizOW+yuSnNW4eXDDDg= X-MS-TrafficTypeDiagnostic: DB8EUR06HT177: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YiTf6+qkNhOVPcFxUPzEIwojb9EpZTI20TbUoOgypJkNtk2gilhJDLtKAvuIAK7MoHlx5Jb2Nq2OF5QhmWv5UhDy5dpfBpYNA7c/N1utg76Hd1eYTY0cgqeQBYt6geKtarVadaGC1m5pNZo4qo0DzOwREZpLHxvan6CpjrhaI7MIIu2F0W0To8yarJDap+wdVef3W44g7YysAHRFb0gNCDX17STOJ3RpKMq6TlHndhOl507NRFk+jf0/fFObaR9lNDQ1ZlRLYf7KUHcewqfgkotBQihorxHf/hOWkHBHXW2PUdcbBYNHf8WqNpDfq5DSd4YJeICwg4DfW1aW1UrQWIPeaIzEOY0M9puh8TRCc8UsN/WfU6ys6gfziz7sefxePbQ3j1BvEcawlzVovurWdw== X-MS-Exchange-AntiSpam-MessageData: D2+N2Ifkf7puERkEUKv2cSi9wuY3oQqabtkULuVRrI5PdB0ddF/pQvh0aszYy6hU3geg7eWwVnKP6noqI9+hYOS/vUXYpAlCA7XLkRSJ4thSlXzD7ALT+O97xqpd+W6SWj/ZQXppdOhahtgzJX34WA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2df8c51c-493f-4a9d-1903-08d92f859d45 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:41:56.7881 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR06HT177 Subject: [FFmpeg-devel] [PATCH 05/17] avcodec/avcodec: Don't include 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: hWqrz2slUv3F It is not used here at all; instead, add it where it is used without including it or any of the arch-specific CPU headers. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 1 - libavcodec/frame_thread_encoder.c | 1 + libavcodec/libaomdec.c | 1 + libavcodec/libaomenc.c | 1 + libavcodec/libdav1d.c | 1 + libavcodec/libdavs2.c | 1 + libavcodec/libuavs3d.c | 1 + libavcodec/libvpxdec.c | 1 + libavcodec/libvpxenc.c | 1 + libavcodec/tests/aarch64/dct.c | 1 + libavcodec/tests/arm/dct.c | 1 + libavcodec/tests/motion.c | 1 + libavcodec/tests/ppc/dct.c | 1 + libavcodec/tests/x86/dct.c | 1 + libavfilter/dnn/dnn_backend_openvino.c | 1 + libavutil/frame.c | 1 + libavutil/slicethread.c | 1 + libpostproc/postprocess.c | 1 + libswresample/resample.c | 1 + tools/target_dec_fuzzer.c | 1 + 20 files changed, 19 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5457f47bd0..2304f6d6bb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -31,7 +31,6 @@ #include "libavutil/attributes.h" #include "libavutil/avutil.h" #include "libavutil/buffer.h" -#include "libavutil/cpu.h" #include "libavutil/dict.h" #include "libavutil/frame.h" #include "libavutil/log.h" diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index b3e571f4b0..9cabfc495f 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -23,6 +23,7 @@ #include "frame_thread_encoder.h" #include "libavutil/avassert.h" +#include "libavutil/cpu.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/thread.h" diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 6e7324a832..75ecc08970 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -27,6 +27,7 @@ #include #include "libavutil/common.h" +#include "libavutil/cpu.h" #include "libavutil/imgutils.h" #include "avcodec.h" diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index f977fb4889..485a3be48f 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -30,6 +30,7 @@ #include "libavutil/avassert.h" #include "libavutil/base64.h" #include "libavutil/common.h" +#include "libavutil/cpu.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 50e6200f5d..cd67a906e2 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -22,6 +22,7 @@ #include #include "libavutil/avassert.h" +#include "libavutil/cpu.h" #include "libavutil/film_grain_params.h" #include "libavutil/mastering_display_metadata.h" #include "libavutil/imgutils.h" diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index 28cad9c5f7..a1672d1c95 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/cpu.h" #include "avcodec.h" #include "internal.h" #include "davs2.h" diff --git a/libavcodec/libuavs3d.c b/libavcodec/libuavs3d.c index f7e458b356..1d523c8722 100644 --- a/libavcodec/libuavs3d.c +++ b/libavcodec/libuavs3d.c @@ -24,6 +24,7 @@ #include "libavutil/avassert.h" #include "libavutil/avutil.h" #include "libavutil/common.h" +#include "libavutil/cpu.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index f9b4c9f427..42d1b8ab1c 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -29,6 +29,7 @@ #include #include "libavutil/common.h" +#include "libavutil/cpu.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 94932a48da..70c8465358 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -38,6 +38,7 @@ #include "libavutil/avstring.h" #include "libavutil/base64.h" #include "libavutil/common.h" +#include "libavutil/cpu.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" diff --git a/libavcodec/tests/aarch64/dct.c b/libavcodec/tests/aarch64/dct.c index 032a9638f6..9e477328d5 100644 --- a/libavcodec/tests/aarch64/dct.c +++ b/libavcodec/tests/aarch64/dct.c @@ -18,6 +18,7 @@ #include "config.h" +#include "libavutil/cpu.h" #include "libavcodec/aarch64/idct.h" static const struct algo fdct_tab_arch[] = { diff --git a/libavcodec/tests/arm/dct.c b/libavcodec/tests/arm/dct.c index 596d369a99..5f826e84df 100644 --- a/libavcodec/tests/arm/dct.c +++ b/libavcodec/tests/arm/dct.c @@ -18,6 +18,7 @@ #include "config.h" +#include "libavutil/cpu.h" #include "libavcodec/arm/idct.h" static const struct algo fdct_tab_arch[] = { diff --git a/libavcodec/tests/motion.c b/libavcodec/tests/motion.c index d89f9408c2..ef6e1ff309 100644 --- a/libavcodec/tests/motion.c +++ b/libavcodec/tests/motion.c @@ -29,6 +29,7 @@ #include "config.h" #include "libavcodec/me_cmp.h" +#include "libavutil/cpu.h" #include "libavutil/internal.h" #include "libavutil/lfg.h" #include "libavutil/mem.h" diff --git a/libavcodec/tests/ppc/dct.c b/libavcodec/tests/ppc/dct.c index d95db525af..e29dbb0aa3 100644 --- a/libavcodec/tests/ppc/dct.c +++ b/libavcodec/tests/ppc/dct.c @@ -18,6 +18,7 @@ #include "config.h" +#include "libavutil/cpu.h" #include "libavcodec/ppc/fdct.h" static const struct algo fdct_tab_arch[] = { diff --git a/libavcodec/tests/x86/dct.c b/libavcodec/tests/x86/dct.c index f5c238efc7..104a0f8e0c 100644 --- a/libavcodec/tests/x86/dct.c +++ b/libavcodec/tests/x86/dct.c @@ -18,6 +18,7 @@ #include "config.h" +#include "libavutil/cpu.h" #include "libavutil/mem_internal.h" #include "libavcodec/x86/fdct.h" diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 709a772a4d..1c7ac0844f 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -27,6 +27,7 @@ #include "dnn_io_proc.h" #include "libavformat/avio.h" #include "libavutil/avassert.h" +#include "libavutil/cpu.h" #include "libavutil/opt.h" #include "libavutil/avstring.h" #include "libavutil/detection_bbox.h" diff --git a/libavutil/frame.c b/libavutil/frame.c index 2ec59b44b1..b0ceaf7145 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -20,6 +20,7 @@ #include "avassert.h" #include "buffer.h" #include "common.h" +#include "cpu.h" #include "dict.h" #include "frame.h" #include "imgutils.h" diff --git a/libavutil/slicethread.c b/libavutil/slicethread.c index dfbe551ef2..f928a5cf00 100644 --- a/libavutil/slicethread.c +++ b/libavutil/slicethread.c @@ -17,6 +17,7 @@ */ #include +#include "cpu.h" #include "slicethread.h" #include "mem.h" #include "thread.h" diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index 8d44165dee..2ca7a3779d 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -76,6 +76,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks #include "config.h" #include "libavutil/avutil.h" #include "libavutil/avassert.h" +#include "libavutil/cpu.h" #include "libavutil/intreadwrite.h" #include #include diff --git a/libswresample/resample.c b/libswresample/resample.c index df49505bf9..f1ec77f54b 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -27,6 +27,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/cpu.h" #include "resample.h" static inline double eval_poly(const double *coeff, int size, double x) { diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 0f4d4f1bed..15107caea8 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -47,6 +47,7 @@ #include "config.h" #include "libavutil/avassert.h" +#include "libavutil/cpu.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h"