From patchwork Mon Jun 14 22:41:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28271 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3247123iol; Mon, 14 Jun 2021 15:42:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTY3LeS2s1S3Eh82fhWqxG+hoG47OBpuLk7zcgxrvjjvi8hhOPt4axeM8poyN5OkWoNFhL X-Received: by 2002:a17:906:7946:: with SMTP id l6mr6375295ejo.50.1623710569374; Mon, 14 Jun 2021 15:42:49 -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 z7si12025860edx.603.2021.06.14.15.42.49; Mon, 14 Jun 2021 15:42:49 -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=pNLNBfXR; 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 2C635689A12; Tue, 15 Jun 2021 01:42:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2013.outbound.protection.outlook.com [40.92.16.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32D62689965 for ; Tue, 15 Jun 2021 01:42:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FShHdr7Y1rFIRmF7nGyI/GfWqBWcnYYGC9ePR891s95uZgCnTx8yc1R9R5I89oBjRkFJ85aN3HumBmJMuUYGue/PxdVEFRQ1D1DHWhAgQwV/EbFgfIw01kYPRUK3hD/2hh79VVrreac3nsgeFw+pvE7R8zFiheCOo3l6+j+kWhUDKAUGj2dQUifQeGz6nkjIwHqTRWLwnaH9TN2z8yyrOchFkVz5bWyacSNEYLtdWjFxG7FQwhOWU0dNbS5dxk/OjrMhawLrhVEHGgHfETJGkT4Wt5mW6IYWkb87rjguvQ5NRohaSkjanbWe6DecwPMiMkqPbHhWBzl0lq1WdgRMGQ== 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=KUmJge2O+Ea4Yyk7kGJqbG1VwnzI+figf2xR7PmdYlc=; b=cwcHdsnITXOy/J2H1L2vnaP+VgsGb4EhkpI8FRppCsIhmybWiTaX2mYCWTnfxu6MmiVGTqBD6OW/nFIHn0WRPg/ByV6ZUjTRvxeXmNbDRjNezHxgatGKYv5ZPnHKM6rw/TcE4dmNouVKqNNY5MJnKt5mUy7EkF1fwdHUntsQAq6vCTbnc/9dCro1PdMXxP/6n1GEiU7Fkd49C7uNOqiHxm2TUODqT4GNe+9j5BNioCTuYiLcaH1fFn9/pZ8pYL1pVW05B6fMU520+EydXU1FYzTpPvcoAjXAbfr0BovJIpeRKakWm5vwGHXKjM5/Qq+EO9fODUg2wb50YrQsYhJ3iw== 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=KUmJge2O+Ea4Yyk7kGJqbG1VwnzI+figf2xR7PmdYlc=; b=pNLNBfXRy2jKhMqE2R56b5lVJd/AsSMq67g17zfNLA9Ete223MYNOKCjl3Z73FTJlJ1E8hKf68UY/j6+kzRzZ4ctLAVv76qNg6R1hfIYd4PqidHAUyrKxU1ZraJ9LJ07Yeyv/7dziB2AhA35AEVBKN8qqtyo8J4NHInHT3DNfGmWqrIJZdONIk9IQTPCIkpqMcBxSIXKMQqFm6OYkZifwYcjLHIZ3WQOcGk42JQ+VSeU1meCblh9DUv2M3ezOrCQi3WdLsKbHXJDOHKUCdn7gGjawnuZocval83GDItR8UsA3KeP7CXI+JiTE0fq734yDX7aVi4F2BvWObEstAqZvQ== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::50) by DB8EUR06HT127.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::66) 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:59 +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:59 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:6334FCFEDF5E5C2F080E2F9469FE07F645ED0BB16398FE3A0458EA25726AA931; UpperCasedChecksum:B43FD67010336958A1A3A57083965D7FAAF1F795F729616087EBE36271913C0C; SizeAsReceived:7608; 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:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:23 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Rd/KVGiEzeSBEz23iBeD0koe0Zrek+8X] 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-6-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:58 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 93850ede-7926-4363-c361-08d92f859e86 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS8u28ets82B/Gq5G20dnAw84Y11wOOZpl27D+GRu8TgcYOeyoYRPmTTXgJkVJpyRJy0BjtwXJJheVXLj8jKpfSsmpETsrTmtgVAmRwFbIeUKkOh4rDkFCb7K1O8PmEMQlles4rvGgs+92aIDUTzIU/oo0nRNw7VqXOCBKx1pynWBEfE215yvwE8/0r+s1qfyEWjZVPBN9eYrLoEsVpT8j9yl24D6cpXB27GI9TmtoAF259M4GRl9H3/Nd6bLjTWnuv0H6jsLopIu1gwSt4f0wuvjF4BDay3jP35+YRefyV2+2BbWWPz1r5gQNZnzumLPGr9mkYl0KVVdPIGr6kGfUNGJC7yxtli5pul+cFFIia3zxdgCc0iNjEAR/mAHeMCM61Qt/MCjXDsZb1pW+XWfYXQbJmWjoGwPgpW4T+59TxOiG0qpthLa+Gg28LNeDyrzGdqxJAhxE6xhIuqBzAGG7h/csQy8kaZuUSU+an4jx9N+eKc8mI0Svi2neCTcozsSIq17+B95SCQEb0MNejBmH/JU6LP24/oNPpkvmEZoJ7y+QsejTAVFVwanzdeK28bA/6vNIlushk047vmqoX9qlWROA/mFD8pIa3S0GBJ8wbk38pgh2PaGhjDlfAbcCtSx8CXwA4bhorUOGrKL0h+f9dSx7Rp5siKGxIJ0pR60VjEmL1U4v4ftbUFL3CeDQkkvfp9wV+lZjQmqt39QwoYZ6fNoCohh7O5LANJDThOFE2LTFc8r4u/kliJS78TM6wleE= X-MS-TrafficTypeDiagnostic: DB8EUR06HT127: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vcw67/2y4ImaGKUqMaRHxjefHQNY6wx/LTqkk8J5naO2TRzykgwisEeKhu9kn8p/Tduw/Fk5gWnRX1giFDKY5TUooCwMpWmwb9YyeZN9/MLVssuWlH+f76AyIK57ZEZhFK6lpukSMshReR2ImZiMbZ22sRxMwcBGVGwz7DpGrmmt2dR6yYObpdxMwfalA7NmOFPLb1H7Nv0C3BUJM8IQZVyxgWSZ3KapuEqz56WmFFOpHT2n7gjwYdfXatw0e5Sc7Z0lL63c83skCdVeJFfDLMCQf9wJXEIRJ9F6x6EAP3Bb7wtsr6dYUVT3Yg8+f1txc+EYGV0zYrEyNfrSeTRDB790s1m+HXjw271lYOQ+kiVfQffzB3tZOMpZbH8aYvUnCmRjtdyRt8SvK0gZD4rUGQ== X-MS-Exchange-AntiSpam-MessageData: t54JrMR+AxKo4laXgTDKehvarqP11sm+pUgycruRTfwOOhsYeqNnbkHEbzJRIoSN5VrkF6rbFFQwZwkXxufQSO1exWfMoEkRjCXm4afYWhed6tbHpP96ItBPLkh7ubGBvhmS4XIJz+1jW45V31LeJA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93850ede-7926-4363-c361-08d92f859e86 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:41:58.8872 (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: DB8EUR06HT127 Subject: [FFmpeg-devel] [PATCH 07/17] avutil/internal, swresample/audioconvert: Remove cpu.h inclusions 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: D3+vdjuteZbc These inclusions are not necessary, as cpu.h is already included wherever it is needed (via direct inclusion or via the arch-specific headers). Signed-off-by: Andreas Rheinhardt --- I did my best to make sure this is correct on all arches; but testing is always welcome. libavutil/internal.h | 1 - libswresample/audioconvert.h | 1 - 2 files changed, 2 deletions(-) diff --git a/libavutil/internal.h b/libavutil/internal.h index 7cd36ff742..a33e8700c3 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -40,7 +40,6 @@ #include "config.h" #include "attributes.h" #include "timer.h" -#include "cpu.h" #include "dict.h" #include "macros.h" #include "pixfmt.h" diff --git a/libswresample/audioconvert.h b/libswresample/audioconvert.h index 1ca30c2a65..bb143a876d 100644 --- a/libswresample/audioconvert.h +++ b/libswresample/audioconvert.h @@ -30,7 +30,6 @@ #include "swresample_internal.h" -#include "libavutil/cpu.h" typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end);