From patchwork Wed Apr 14 17:00:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26910 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 615384498EC for ; Wed, 14 Apr 2021 20:00:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 30FA2689FE7; Wed, 14 Apr 2021 20:00:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064058.outbound.protection.outlook.com [40.92.64.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B659D68A36E for ; Wed, 14 Apr 2021 20:00:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JS3s6PVBukMPhcG3JqhnEeDslF4r/c57b709h6F8+aErgPRs244PP1HeNtYnYlMdixpV1Igz4kF+chLtXdX5Eo/MRUXdpX9FMmAK9LTecvPeS/1cviHTn+tsZ961XE+KOPYDeoMbO3nku9mOyCP1/h/1cNyW1ec4aPmEe1jBH97FgLV3mWcjdg1M5KABFjt3F90L5N7MfTwjBF/V4pYZoitg09RuSsYC/HC2OKW25PCkcAOU9TVYsW8i6GbjyV87uVM3hJ0H3xMKneTM+5VVxtbcew/ubO6svGyXldK82186euhIik+ezP03frO9C90SxU4KwbixajzVBvDKTn9wdw== 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=PsRWkiiHFyZ2t+OJQUzPbY9waIBPtU94cgohe7hFRsA=; b=I5J6F6PG+GgRXAO3jgLhrftvoQtZD7UGfNGtEixlOYDj7ylCVCara3HfHaETynyJ8zNGypqDT/bih8NoA7AohK5/6EdSRLauoDK/OwVFdzWRA+iLugRcZBNntdoYlHodZ6Mu1ce3ix4eDZpfwIVB2PPysN+iFS8tVS6smin3MXAx/xobVqtItdJJfmYsM3ZFE/gWBg1/aF0GNgeOcaipWCqaQpEUj+JdKbTctBoaD38DOBZtiTXxUNsY4Bu05SjagxJ/4qSgR8tb1QZKW4NMK6LsEIpX8MqyncN0MNzErGvVnAOHW3gQfEDTuEsFfYq/3c/N8zahIHx4jcfkdkuQJQ== 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=PsRWkiiHFyZ2t+OJQUzPbY9waIBPtU94cgohe7hFRsA=; b=faMcPA8HKPXdQWftoyvhqUfDM3vR1XcCu3UQatIJSmyZ18XbBo2XfNU8JbhphM/90v1yM4BafuD95RneH6JtKElZMgvI6uIMgd2gehcSyI8znEZs+BGDS8DwDL1d3Vp6R828DdzCTxm8D9tGpTGUUm5d2lihXEmZbnXGtqPasXKKduFi8ig19ukeqSsTgbGJzdIE0dNVgYog8RwmlA0lnXE/lS0Awdrp5IvqoxxDJWDAF8UQ3zmuV4uysq8XdCcxnDBY42thOVEgDXAuD5Sh0PH8d/1ohej2RikusGk0I8jmRIOvX/5Ovv0LFZkg2/umaKZUfq8Oh1jE+YNnRxLnfw== Received: from VE1EUR01FT024.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e19::48) by VE1EUR01HT113.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e19::272) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17; Wed, 14 Apr 2021 17:00:37 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e19::4c) by VE1EUR01FT024.mail.protection.outlook.com (2a01:111:e400:7e19::213) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Wed, 14 Apr 2021 17:00:37 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:29EC24FC3775065743B22E3A93187E51EF9EEE7DB108A3524CAE13E3E90C1920; UpperCasedChecksum:C9BBBF4DDF490CB7A07554F94BFA3D96DCDC59A6A77F2961DA5607636ACB0AB3; SizeAsReceived:7336; Count:45 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.016; Wed, 14 Apr 2021 17:00:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Apr 2021 19:00:25 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [ssTCHfJLPDbLU5Ze5rLjESHzqiQgqOl+] X-ClientProxiedBy: FR0P281CA0065.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::18) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210414170026.1019445-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by FR0P281CA0065.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.8 via Frontend Transport; Wed, 14 Apr 2021 17:00:35 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 17d4c79e-b6ee-4b6c-ef2e-08d8ff66d2a4 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULVtCBeMNItAGBsO857D/3HnpGLCkU8ujEfREhplqdXKhJuQ2SE3iON2bw39yeJ6kNjxmykFoBchprzQf9o/D4yLxEei/ZMnJpTz2Mo4IVQkvhDYYkNHWMXRSQDhzQ1lS/u6w3Q2tI9PEwMFkN46arro0x9YAkIMKnD5PHKmIQnco6/CPdqSXAyx3LqWUDxXfkrQFch8nhRtL3449Y9P7zX1HSK/NpjXZe6koptT9OKV1O/328UoY3yIyN/bakmDjJX3pgn3ZtaJ8C30SUAPjZ4IyrEwOCx1qiREqaqs+KGf9Ukhr9zqo0RObWLkJd72O2exqkHkyVvrMtg3IOdpo9T/miOGeyg00K35chznZnPjXEdWl4pcDn8PfMTRBem2S6oAIodhwej2fIbc6E1/CuAz5JrBUq8JE1J7Kqmt+RjoyOMmlCcdNPx7jEP4pem0VVjGsRAH8KC8TqQ7PFXO6KhH3aQjHTtt5YjuBqIwOfx0RjG60YpowcbuS5RFeZ8XN2wvKyJQ59am3Hgv8MYqeMcZBOs1ERP1XIMfs+j5QAPi7pasAZEJQPABbIj6Be3BeUdNiS83ZpiGCr8rf/tMt/eXu86vFH+bLdVpilEqaVsuYlri0iDNgIHKSrBJX2ln/swJCJ6sgtMXrHtGLgVodX0xsPvS2PovDd78sJTFFM/NMiZU74V7mh+VVVz7/pIXRhTSPu2UEM19Q== X-MS-TrafficTypeDiagnostic: VE1EUR01HT113: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VgG0xCpGayKrS4y7BdXsNe+fVrfQiMThrGlbyIrvtsImFWGZ6HeHYm6aeoBioGddQetbX+yhUtgc8QQlDx2woQgFoK+FGe41+fxmPZY+OuJjsO5huOqq8HF7aWfKqXDClzgc5vc1j+FxLVEiMbidVl5GV7tY0e59F+m1ghZ32OzJgohPA4kwjkYaqRltMoPAGtTkUaUKa38BqnupWvR5/uX/OuXm7L6Xf9OcsyR8DI/Kqtjan+oz55pySrHXnPaQPBChICl+J+bzNeheq2TevlhAjYhCj4kL6UPLzD2U/gyWninPqJQVN71bYy9cIEmYe0khr07WN9XHUaSyjCvJY/UEtk5qZCKKDhLtdV1nubfxHQexzghSjnOaBMzaYfCVf13+Z/J3XI4agh5wqXWHUA== X-MS-Exchange-AntiSpam-MessageData: KTgvET1RtO19t4log5vC2kXrEdYo4FnbxyCcN0Wx1BEoitkmN7XInyula0nCMmvpXG317IDcfI940SZ7PPh0Pp98cPtABfEyvFbdyC+DG0Ft6+ndYmUWNhbybf/LVnBtbbVPazLSvBXw3ZjGFprgdw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17d4c79e-b6ee-4b6c-ef2e-08d8ff66d2a4 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2021 17:00:36.2834 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT024.eop-EUR01.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: VE1EUR01HT113 Subject: [FFmpeg-devel] [PATCH 1/2] Include attributes.h directly X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Some files currently rely on libavutil/cpu.h to include it for them; yet said file won't use include it any more after the currently deprecated functions are removed, so include attributes.h directly. Signed-off-by: Andreas Rheinhardt --- libavcodec/aarch64/aacpsdsp_init_aarch64.c | 1 + libavcodec/aarch64/opusdsp_init.c | 1 + libavcodec/arm/flacdsp_init_arm.c | 1 + libavcodec/arm/mpegvideo_arm.c | 1 + libavcodec/arm/mpegvideoencdsp_init_arm.c | 1 + libavcodec/arm/sbcdsp_init_arm.c | 1 + libavcodec/mips/aacdec_mips.c | 1 + libavcodec/mips/cabac.h | 1 + libavcodec/mips/fft_mips.c | 1 + libavcodec/mips/fmtconvert_mips.c | 1 + libavcodec/mips/h263dsp_init_mips.c | 1 + libavcodec/mips/h264chroma_init_mips.c | 1 + libavcodec/mips/h264dsp_init_mips.c | 1 + libavcodec/mips/h264pred_init_mips.c | 1 + libavcodec/mips/h264qpel_init_mips.c | 1 + libavcodec/mips/idctdsp_init_mips.c | 1 + libavcodec/mips/lsp_mips.h | 1 + libavcodec/mips/me_cmp_init_mips.c | 1 + libavcodec/mips/mpegvideo_init_mips.c | 1 + libavcodec/mips/mpegvideoencdsp_init_mips.c | 1 + libavcodec/mips/vc1dsp_mmi.c | 2 +- libavcodec/mips/vp8dsp_mmi.c | 1 + libavcodec/mips/vp9dsp_init_mips.c | 1 + libavcodec/mips/xvididct_init_mips.c | 1 + libavcodec/neon/mpegvideo.c | 1 + libavcodec/ppc/fft_init.c | 1 + libavcodec/ppc/mpegvideodsp.c | 1 + libavcodec/ppc/vp8dsp_altivec.c | 1 + libavcodec/x86/aacencdsp_init.c | 1 + libavcodec/x86/celt_pvq_init.c | 1 + libavcodec/x86/fdct.c | 1 + libavcodec/x86/flacdsp_init.c | 1 + libavcodec/x86/mdct15_init.c | 1 + libavcodec/x86/opusdsp_init.c | 1 + libavcodec/x86/sbcdsp_init.c | 1 + libavcodec/x86/snowdsp.c | 1 + libavcodec/x86/takdsp_init.c | 1 + libavcodec/x86/ttadsp_init.c | 1 + libavcodec/x86/ttaencdsp_init.c | 1 + libavcodec/x86/v210-init.c | 1 + libavcodec/x86/v210enc_init.c | 1 + libavcodec/x86/vc1dsp_mmx.c | 1 + libavcodec/x86/vp56_arith.h | 2 ++ libavcodec/x86/vp9dsp_init.h | 1 + libavfilter/aarch64/vf_nlmeans_init.c | 1 + libavutil/mips/libm_mips.h | 2 ++ libavutil/x86/lls_init.c | 1 + libswresample/aarch64/resample_init.c | 1 + libswresample/arm/resample_init.c | 1 + libswresample/x86/audio_convert_init.c | 1 + libswresample/x86/rematrix_init.c | 1 + libswresample/x86/resample_init.c | 1 + libswscale/aarch64/swscale.c | 1 + libswscale/arm/swscale.c | 1 + libswscale/ppc/swscale_ppc_template.c | 1 + libswscale/x86/hscale_fast_bilinear_simd.c | 1 + 56 files changed, 58 insertions(+), 1 deletion(-) diff --git a/libavcodec/aarch64/aacpsdsp_init_aarch64.c b/libavcodec/aarch64/aacpsdsp_init_aarch64.c index 5e7e19bba4..cc9e4d79bd 100644 --- a/libavcodec/aarch64/aacpsdsp_init_aarch64.c +++ b/libavcodec/aarch64/aacpsdsp_init_aarch64.c @@ -18,6 +18,7 @@ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/aarch64/cpu.h" #include "libavcodec/aacpsdsp.h" diff --git a/libavcodec/aarch64/opusdsp_init.c b/libavcodec/aarch64/opusdsp_init.c index cc6a1b672d..bb6d71b66b 100644 --- a/libavcodec/aarch64/opusdsp_init.c +++ b/libavcodec/aarch64/opusdsp_init.c @@ -18,6 +18,7 @@ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/aarch64/cpu.h" #include "libavcodec/opusdsp.h" diff --git a/libavcodec/arm/flacdsp_init_arm.c b/libavcodec/arm/flacdsp_init_arm.c index 564e3dc79b..c4a6e3a535 100644 --- a/libavcodec/arm/flacdsp_init_arm.c +++ b/libavcodec/arm/flacdsp_init_arm.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavcodec/flacdsp.h" #include "config.h" diff --git a/libavcodec/arm/mpegvideo_arm.c b/libavcodec/arm/mpegvideo_arm.c index 918be16d03..008ef18eea 100644 --- a/libavcodec/arm/mpegvideo_arm.c +++ b/libavcodec/arm/mpegvideo_arm.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/internal.h" #include "libavutil/arm/cpu.h" #include "libavcodec/avcodec.h" diff --git a/libavcodec/arm/mpegvideoencdsp_init_arm.c b/libavcodec/arm/mpegvideoencdsp_init_arm.c index 4bfe835684..31d1474416 100644 --- a/libavcodec/arm/mpegvideoencdsp_init_arm.c +++ b/libavcodec/arm/mpegvideoencdsp_init_arm.c @@ -18,6 +18,7 @@ #include +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/arm/cpu.h" #include "libavcodec/avcodec.h" diff --git a/libavcodec/arm/sbcdsp_init_arm.c b/libavcodec/arm/sbcdsp_init_arm.c index b8fa5a35ab..b3a2c3d083 100644 --- a/libavcodec/arm/sbcdsp_init_arm.c +++ b/libavcodec/arm/sbcdsp_init_arm.c @@ -29,6 +29,7 @@ * SBC ARMv6 optimization for some basic "building bricks" */ +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/mem_internal.h" #include "libavutil/arm/cpu.h" diff --git a/libavcodec/mips/aacdec_mips.c b/libavcodec/mips/aacdec_mips.c index 7f2478957f..7b5f18a5d8 100644 --- a/libavcodec/mips/aacdec_mips.c +++ b/libavcodec/mips/aacdec_mips.c @@ -52,6 +52,7 @@ * Reference: libavcodec/aacdec.c */ +#include "libavutil/attributes.h" #include "libavcodec/aac.h" #include "aacdec_mips.h" #include "libavcodec/aactab.h" diff --git a/libavcodec/mips/cabac.h b/libavcodec/mips/cabac.h index 3d09e93523..47d2969201 100644 --- a/libavcodec/mips/cabac.h +++ b/libavcodec/mips/cabac.h @@ -24,6 +24,7 @@ #ifndef AVCODEC_MIPS_CABAC_H #define AVCODEC_MIPS_CABAC_H +#include "libavutil/attributes.h" #include "libavcodec/cabac.h" #include "libavutil/mips/asmdefs.h" #include "config.h" diff --git a/libavcodec/mips/fft_mips.c b/libavcodec/mips/fft_mips.c index a6656d9650..bf91fc316c 100644 --- a/libavcodec/mips/fft_mips.c +++ b/libavcodec/mips/fft_mips.c @@ -48,6 +48,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "config.h" +#include "libavutil/attributes.h" #include "libavcodec/fft.h" #include "libavcodec/fft_table.h" #include "libavutil/mips/asmdefs.h" diff --git a/libavcodec/mips/fmtconvert_mips.c b/libavcodec/mips/fmtconvert_mips.c index 990958402c..89c699854e 100644 --- a/libavcodec/mips/fmtconvert_mips.c +++ b/libavcodec/mips/fmtconvert_mips.c @@ -48,6 +48,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "config.h" +#include "libavutil/attributes.h" #include "libavcodec/avcodec.h" #include "libavcodec/fmtconvert.h" #include "libavutil/mips/asmdefs.h" diff --git a/libavcodec/mips/h263dsp_init_mips.c b/libavcodec/mips/h263dsp_init_mips.c index a73eb12d87..829b10b251 100644 --- a/libavcodec/mips/h263dsp_init_mips.c +++ b/libavcodec/mips/h263dsp_init_mips.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/mips/cpu.h" #include "h263dsp_mips.h" diff --git a/libavcodec/mips/h264chroma_init_mips.c b/libavcodec/mips/h264chroma_init_mips.c index 6bb19d3ddd..5551a7c2fe 100644 --- a/libavcodec/mips/h264chroma_init_mips.c +++ b/libavcodec/mips/h264chroma_init_mips.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/mips/cpu.h" #include "h264chroma_mips.h" diff --git a/libavcodec/mips/h264dsp_init_mips.c b/libavcodec/mips/h264dsp_init_mips.c index 9cd05e0f2f..ce4dd369ba 100644 --- a/libavcodec/mips/h264dsp_init_mips.c +++ b/libavcodec/mips/h264dsp_init_mips.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/mips/cpu.h" #include "h264dsp_mips.h" diff --git a/libavcodec/mips/h264pred_init_mips.c b/libavcodec/mips/h264pred_init_mips.c index 0fd9bb737a..d23d74ab5e 100644 --- a/libavcodec/mips/h264pred_init_mips.c +++ b/libavcodec/mips/h264pred_init_mips.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/mips/cpu.h" #include "config.h" #include "h264dsp_mips.h" diff --git a/libavcodec/mips/h264qpel_init_mips.c b/libavcodec/mips/h264qpel_init_mips.c index ea839f0714..2633417802 100644 --- a/libavcodec/mips/h264qpel_init_mips.c +++ b/libavcodec/mips/h264qpel_init_mips.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/mips/cpu.h" #include "h264dsp_mips.h" diff --git a/libavcodec/mips/idctdsp_init_mips.c b/libavcodec/mips/idctdsp_init_mips.c index 23efd9ed58..728e02981c 100644 --- a/libavcodec/mips/idctdsp_init_mips.c +++ b/libavcodec/mips/idctdsp_init_mips.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/mips/cpu.h" #include "idctdsp_mips.h" #include "xvididct_mips.h" diff --git a/libavcodec/mips/lsp_mips.h b/libavcodec/mips/lsp_mips.h index 6219c5aa40..23b2b6bfda 100644 --- a/libavcodec/mips/lsp_mips.h +++ b/libavcodec/mips/lsp_mips.h @@ -56,6 +56,7 @@ #if HAVE_MIPSFPU && HAVE_INLINE_ASM #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 +#include "libavutil/attributes.h" #include "libavutil/mips/asmdefs.h" static av_always_inline void ff_lsp2polyf_mips(const double *lsp, double *f, int lp_half_order) diff --git a/libavcodec/mips/me_cmp_init_mips.c b/libavcodec/mips/me_cmp_init_mips.c index e3e33b8e5e..90b8b91256 100644 --- a/libavcodec/mips/me_cmp_init_mips.c +++ b/libavcodec/mips/me_cmp_init_mips.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/mips/cpu.h" #include "me_cmp_mips.h" diff --git a/libavcodec/mips/mpegvideo_init_mips.c b/libavcodec/mips/mpegvideo_init_mips.c index bfda90bbcc..f687ad18f1 100644 --- a/libavcodec/mips/mpegvideo_init_mips.c +++ b/libavcodec/mips/mpegvideo_init_mips.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/mips/cpu.h" #include "h263dsp_mips.h" #include "mpegvideo_mips.h" diff --git a/libavcodec/mips/mpegvideoencdsp_init_mips.c b/libavcodec/mips/mpegvideoencdsp_init_mips.c index 71831a61ac..3efbeec34a 100644 --- a/libavcodec/mips/mpegvideoencdsp_init_mips.c +++ b/libavcodec/mips/mpegvideoencdsp_init_mips.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/mips/cpu.h" #include "libavcodec/bit_depth_template.c" #include "h263dsp_mips.h" diff --git a/libavcodec/mips/vc1dsp_mmi.c b/libavcodec/mips/vc1dsp_mmi.c index 8355cd1b26..348ecd206f 100644 --- a/libavcodec/mips/vc1dsp_mmi.c +++ b/libavcodec/mips/vc1dsp_mmi.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/mem_internal.h" @@ -27,7 +28,6 @@ #include "constants.h" #include "vc1dsp_mips.h" #include "hpeldsp_mips.h" -#include "libavutil/mem_internal.h" #include "libavutil/mips/mmiutils.h" #define VC1_INV_TRANCS_8_TYPE1(o1, o2, r1, r2, r3, r4, c0) \ diff --git a/libavcodec/mips/vp8dsp_mmi.c b/libavcodec/mips/vp8dsp_mmi.c index aa6e856dd2..ae0b5550cc 100644 --- a/libavcodec/mips/vp8dsp_mmi.c +++ b/libavcodec/mips/vp8dsp_mmi.c @@ -23,6 +23,7 @@ #include "vp8dsp_mips.h" #include "constants.h" +#include "libavutil/attributes.h" #include "libavutil/mips/mmiutils.h" #include "libavutil/mem_internal.h" diff --git a/libavcodec/mips/vp9dsp_init_mips.c b/libavcodec/mips/vp9dsp_init_mips.c index 5a8c599e7e..27c8ec9d8c 100644 --- a/libavcodec/mips/vp9dsp_init_mips.c +++ b/libavcodec/mips/vp9dsp_init_mips.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/mips/cpu.h" #include "config.h" #include "libavutil/common.h" diff --git a/libavcodec/mips/xvididct_init_mips.c b/libavcodec/mips/xvididct_init_mips.c index ed545cfe17..658a5792e0 100644 --- a/libavcodec/mips/xvididct_init_mips.c +++ b/libavcodec/mips/xvididct_init_mips.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/mips/cpu.h" #include "xvididct_mips.h" diff --git a/libavcodec/neon/mpegvideo.c b/libavcodec/neon/mpegvideo.c index a96ae519f5..8f05d77a65 100644 --- a/libavcodec/neon/mpegvideo.c +++ b/libavcodec/neon/mpegvideo.c @@ -23,6 +23,7 @@ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #if ARCH_AARCH64 # include "libavutil/aarch64/cpu.h" diff --git a/libavcodec/ppc/fft_init.c b/libavcodec/ppc/fft_init.c index 733e58b4c9..65ce64f6a1 100644 --- a/libavcodec/ppc/fft_init.c +++ b/libavcodec/ppc/fft_init.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" #include "libavutil/ppc/util_altivec.h" diff --git a/libavcodec/ppc/mpegvideodsp.c b/libavcodec/ppc/mpegvideodsp.c index 81f4845e6e..42d65dbe3d 100644 --- a/libavcodec/ppc/mpegvideodsp.c +++ b/libavcodec/ppc/mpegvideodsp.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/mem_internal.h" #include "libavutil/ppc/cpu.h" diff --git a/libavcodec/ppc/vp8dsp_altivec.c b/libavcodec/ppc/vp8dsp_altivec.c index 64ee703dc7..273de84778 100644 --- a/libavcodec/ppc/vp8dsp_altivec.c +++ b/libavcodec/ppc/vp8dsp_altivec.c @@ -22,6 +22,7 @@ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/mem_internal.h" #include "libavutil/ppc/cpu.h" diff --git a/libavcodec/x86/aacencdsp_init.c b/libavcodec/x86/aacencdsp_init.c index d761c3c5e6..049a2417d9 100644 --- a/libavcodec/x86/aacencdsp_init.c +++ b/libavcodec/x86/aacencdsp_init.c @@ -21,6 +21,7 @@ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/float_dsp.h" #include "libavutil/x86/cpu.h" #include "libavcodec/aacenc.h" diff --git a/libavcodec/x86/celt_pvq_init.c b/libavcodec/x86/celt_pvq_init.c index 13724c3561..5a0669e6f2 100644 --- a/libavcodec/x86/celt_pvq_init.c +++ b/libavcodec/x86/celt_pvq_init.c @@ -21,6 +21,7 @@ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/x86/cpu.h" #include "libavcodec/opus_pvq.h" diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c index d77f60c86f..033ff1ccc5 100644 --- a/libavcodec/x86/fdct.c +++ b/libavcodec/x86/fdct.c @@ -30,6 +30,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/common.h" #include "libavutil/mem_internal.h" #include "libavutil/x86/asm.h" diff --git a/libavcodec/x86/flacdsp_init.c b/libavcodec/x86/flacdsp_init.c index 1971f81b8d..6315b6903e 100644 --- a/libavcodec/x86/flacdsp_init.c +++ b/libavcodec/x86/flacdsp_init.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavcodec/flacdsp.h" #include "libavutil/x86/cpu.h" #include "config.h" diff --git a/libavcodec/x86/mdct15_init.c b/libavcodec/x86/mdct15_init.c index 444801d9cf..641bfd043f 100644 --- a/libavcodec/x86/mdct15_init.c +++ b/libavcodec/x86/mdct15_init.c @@ -22,6 +22,7 @@ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/x86/cpu.h" #include "libavcodec/mdct15.h" diff --git a/libavcodec/x86/opusdsp_init.c b/libavcodec/x86/opusdsp_init.c index 5c8a4c22e9..582fbb4f0c 100644 --- a/libavcodec/x86/opusdsp_init.c +++ b/libavcodec/x86/opusdsp_init.c @@ -18,6 +18,7 @@ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/x86/cpu.h" #include "libavcodec/opusdsp.h" diff --git a/libavcodec/x86/sbcdsp_init.c b/libavcodec/x86/sbcdsp_init.c index 86effecfdf..7416a86ac6 100644 --- a/libavcodec/x86/sbcdsp_init.c +++ b/libavcodec/x86/sbcdsp_init.c @@ -29,6 +29,7 @@ * SBC MMX optimization for some basic "building bricks" */ +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" #include "libavcodec/sbcdsp.h" diff --git a/libavcodec/x86/snowdsp.c b/libavcodec/x86/snowdsp.c index 218e6864db..84bc74f915 100644 --- a/libavcodec/x86/snowdsp.c +++ b/libavcodec/x86/snowdsp.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" #include "libavcodec/avcodec.h" diff --git a/libavcodec/x86/takdsp_init.c b/libavcodec/x86/takdsp_init.c index fe0c846afd..b2e6e639ee 100644 --- a/libavcodec/x86/takdsp_init.c +++ b/libavcodec/x86/takdsp_init.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavcodec/takdsp.h" #include "libavutil/x86/cpu.h" #include "config.h" diff --git a/libavcodec/x86/ttadsp_init.c b/libavcodec/x86/ttadsp_init.c index 7441c97769..f2954e5687 100644 --- a/libavcodec/x86/ttadsp_init.c +++ b/libavcodec/x86/ttadsp_init.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavcodec/ttadsp.h" #include "libavutil/x86/cpu.h" #include "config.h" diff --git a/libavcodec/x86/ttaencdsp_init.c b/libavcodec/x86/ttaencdsp_init.c index 61971a4282..b470142c50 100644 --- a/libavcodec/x86/ttaencdsp_init.c +++ b/libavcodec/x86/ttaencdsp_init.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavcodec/ttaencdsp.h" #include "libavutil/x86/cpu.h" #include "config.h" diff --git a/libavcodec/x86/v210-init.c b/libavcodec/x86/v210-init.c index cb9a6cbd6a..5db1fef98c 100644 --- a/libavcodec/x86/v210-init.c +++ b/libavcodec/x86/v210-init.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavcodec/v210dec.h" diff --git a/libavcodec/x86/v210enc_init.c b/libavcodec/x86/v210enc_init.c index e997b4b67a..13a351dd1d 100644 --- a/libavcodec/x86/v210enc_init.c +++ b/libavcodec/x86/v210enc_init.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/x86/cpu.h" #include "libavcodec/v210enc.h" diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index 6541dda429..c1c4d76262 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -24,6 +24,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/mem.h" #include "libavutil/mem_internal.h" diff --git a/libavcodec/x86/vp56_arith.h b/libavcodec/x86/vp56_arith.h index 810cc8dcd8..9f7639980c 100644 --- a/libavcodec/x86/vp56_arith.h +++ b/libavcodec/x86/vp56_arith.h @@ -25,6 +25,8 @@ #define AVCODEC_X86_VP56_ARITH_H #if HAVE_INLINE_ASM && HAVE_FAST_CMOV && HAVE_6REGS +#include "libavutil/attributes.h" + #define vp56_rac_get_prob vp56_rac_get_prob static av_always_inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob) { diff --git a/libavcodec/x86/vp9dsp_init.h b/libavcodec/x86/vp9dsp_init.h index ebe7ca8ad0..fc1e0557fa 100644 --- a/libavcodec/x86/vp9dsp_init.h +++ b/libavcodec/x86/vp9dsp_init.h @@ -23,6 +23,7 @@ #ifndef AVCODEC_X86_VP9DSP_INIT_H #define AVCODEC_X86_VP9DSP_INIT_H +#include "libavutil/attributes.h" #include "libavutil/mem_internal.h" #include "libavcodec/vp9dsp.h" diff --git a/libavfilter/aarch64/vf_nlmeans_init.c b/libavfilter/aarch64/vf_nlmeans_init.c index a1edefb144..6793370a4a 100644 --- a/libavfilter/aarch64/vf_nlmeans_init.c +++ b/libavfilter/aarch64/vf_nlmeans_init.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/aarch64/cpu.h" #include "libavfilter/vf_nlmeans.h" diff --git a/libavutil/mips/libm_mips.h b/libavutil/mips/libm_mips.h index 757867bce9..fbf7cf41cc 100644 --- a/libavutil/mips/libm_mips.h +++ b/libavutil/mips/libm_mips.h @@ -53,6 +53,8 @@ #ifndef AVUTIL_MIPS_LIBM_MIPS_H #define AVUTIL_MIPS_LIBM_MIPS_H +#include "libavutil/attributes.h" + static av_always_inline av_const long int lrintf_mips(float x) { register int ret_int; diff --git a/libavutil/x86/lls_init.c b/libavutil/x86/lls_init.c index 1c5dca42dc..c786376915 100644 --- a/libavutil/x86/lls_init.c +++ b/libavutil/x86/lls_init.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/lls.h" #include "libavutil/x86/cpu.h" diff --git a/libswresample/aarch64/resample_init.c b/libswresample/aarch64/resample_init.c index d01ec18756..87e4dd941d 100644 --- a/libswresample/aarch64/resample_init.c +++ b/libswresample/aarch64/resample_init.c @@ -22,6 +22,7 @@ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/avassert.h" diff --git a/libswresample/arm/resample_init.c b/libswresample/arm/resample_init.c index 09b9766ff3..b119943a7c 100644 --- a/libswresample/arm/resample_init.c +++ b/libswresample/arm/resample_init.c @@ -22,6 +22,7 @@ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/avassert.h" diff --git a/libswresample/x86/audio_convert_init.c b/libswresample/x86/audio_convert_init.c index bb89cf604b..a7d5ab89f8 100644 --- a/libswresample/x86/audio_convert_init.c +++ b/libswresample/x86/audio_convert_init.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/x86/cpu.h" #include "libswresample/swresample_internal.h" #include "libswresample/audioconvert.h" diff --git a/libswresample/x86/rematrix_init.c b/libswresample/x86/rematrix_init.c index d6616f83be..e515e4bcff 100644 --- a/libswresample/x86/rematrix_init.c +++ b/libswresample/x86/rematrix_init.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/x86/cpu.h" #include "libswresample/swresample_internal.h" diff --git a/libswresample/x86/resample_init.c b/libswresample/x86/resample_init.c index c6b2a36060..32c080ea4c 100644 --- a/libswresample/x86/resample_init.c +++ b/libswresample/x86/resample_init.c @@ -25,6 +25,7 @@ * @author Michael Niedermayer */ +#include "libavutil/attributes.h" #include "libavutil/x86/cpu.h" #include "libswresample/resample.h" diff --git a/libswscale/aarch64/swscale.c b/libswscale/aarch64/swscale.c index eecbea88ca..09d0a7130e 100644 --- a/libswscale/aarch64/swscale.c +++ b/libswscale/aarch64/swscale.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "libavutil/attributes.h" #include "libswscale/swscale.h" #include "libswscale/swscale_internal.h" #include "libavutil/aarch64/cpu.h" diff --git a/libswscale/arm/swscale.c b/libswscale/arm/swscale.c index 7b8fbcbc79..5f2fd2ce49 100644 --- a/libswscale/arm/swscale.c +++ b/libswscale/arm/swscale.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "libavutil/attributes.h" #include "libswscale/swscale.h" #include "libswscale/swscale_internal.h" #include "libavutil/arm/cpu.h" diff --git a/libswscale/ppc/swscale_ppc_template.c b/libswscale/ppc/swscale_ppc_template.c index 0ffa92725b..84641f3a8b 100644 --- a/libswscale/ppc/swscale_ppc_template.c +++ b/libswscale/ppc/swscale_ppc_template.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/mem_internal.h" static void FUNC(yuv2planeX_8_16)(const int16_t *filter, int filterSize, diff --git a/libswscale/x86/hscale_fast_bilinear_simd.c b/libswscale/x86/hscale_fast_bilinear_simd.c index 850f0add31..f6409b4fc5 100644 --- a/libswscale/x86/hscale_fast_bilinear_simd.c +++ b/libswscale/x86/hscale_fast_bilinear_simd.c @@ -19,6 +19,7 @@ */ #include "../swscale_internal.h" +#include "libavutil/attributes.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavutil/mem_internal.h" From patchwork Wed Apr 14 17:01:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26911 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B6E33449D93 for ; Wed, 14 Apr 2021 20:01:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A59468A82C; Wed, 14 Apr 2021 20:01:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064012.outbound.protection.outlook.com [40.92.64.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3821468A36E for ; Wed, 14 Apr 2021 20:01:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qxqx8PY2n/aFpmovMdFt/tqFBaaZCzEVUNhbHnX1EbQiM6tjhh8udXCIhMf9e9su+V/ywN4CZJdt2weWxMteLMcj7zQzKg5g6X/BaKF7xaSviVd1SEBo49xM1fSLeslIs7k66ncvBt0dv7WGMUCMruhUhkjuhez3AxQB6llOHcbRJUYrICeIJ0CD4yEMKaePDtLt0ivujUDwBiUbRBJMvjA4iVsjjd/TAVEfFJWpgljyonquLoCboUEe/ybvGwyPmo1iSxt2bzQ5HWyZ2IqqSCDwrM/VT1gFNJMT1hHWzHAXm/9v3cQHWumb3a3Ar8zDEOUgzB37TdmMjk59P9TYGw== 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=nQ4EJTitDTcL4ZqtAQQ5KHmBAfqk6FLtXWOYszPwww4=; b=dAI6HNdQ5Yt0JymTPDnOz04h8E9709cEuVe+LwNtpr3hNwxJnv1loL/CdIlhxaDxtjk9WoK7XQEaMpDxRZAWpgQEDNjDr3o4TQ4B9oZxXhlr9BO+yH1QdkpTErbeASD2eTyibEXgcNuGPX/zenfXOcFmCy+x0eTsyW10pEL0sEPk480+Hm0+vhJYJG0HW41nouod/mZqKKgmO+pmwOtHU45KxBxWa4fcKPCU1XVD2OfTNPUVz94fP2R1M4L5TN77RxQh7ca4VaOIrGu1kQ5lBYu6JE4IwjcJFHdukoroAJQQCci0CCjPGiXtCC6yQW7KWzlfuKDeamu7peO9KKiXOQ== 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=nQ4EJTitDTcL4ZqtAQQ5KHmBAfqk6FLtXWOYszPwww4=; b=S3jHpnITMXJla/TSmXKmYCcno1X6lIcZlN92ZETtDFbfI1AqdHccvfJJVFkOOIxiIEONpb+6LQuoCF2mDUQpdDLs9g0hzxf4YzkA/f2uB+5lOQrcMECcRfS9PfMN5hlElZzbYpJY25Iv1UIvBG2yHnDHbsD1l9/To1UOMwjtPrCw2h1OVmaoIzxwZlsV0m9NHR9WArMaJH6nWADUvU1fT8RnsTwfLtXwbWefFnzw5R2VourS9L2V+4rRF4iYSBjXYjKG4RyN9IjJWMzKRHP9+iicUqWH+pj+o6RyMumUFcWqCO1JFn+1oqzLKY2M+AaSwgEkxE76wkdJQnRDqm6J1g== Received: from VE1EUR01FT024.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e19::45) by VE1EUR01HT062.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e19::376) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17; Wed, 14 Apr 2021 17:01:40 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e19::4c) by VE1EUR01FT024.mail.protection.outlook.com (2a01:111:e400:7e19::213) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Wed, 14 Apr 2021 17:01:40 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:712AA0585EAAD2A39FCFDC59A37BB541F93D2BF91DE4D0805E0531DD7ABDD641; UpperCasedChecksum:DB75B7596872083DC44882BFB5307F037B0B2CF90192C21DD881BFBF311340F2; SizeAsReceived:7572; Count:47 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.016; Wed, 14 Apr 2021 17:01:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Apr 2021 19:01:32 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [psDv7ECL+fEL0zL/lyvedODVNsLhoRGe] X-ClientProxiedBy: AM4PR0101CA0068.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::36) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210414170132.1019563-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM4PR0101CA0068.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Wed, 14 Apr 2021 17:01:40 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 6880db7a-fffe-4c20-afa7-08d8ff66f93b X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8nQHKKARcyMCN6yBZ/Ci5FgxRbUFhqdp9Y50Xl2EceGBTj9RB2xSYJPlgxmnxnCrJc8B9Qo0hA0GohBugKO1dkfeGbXpb00UiR3aFNnzVVd0/6R0ODCjXXs0FAIRjd9Y8+jH5lw11nukBGMIDTkFvRju39CrY5Xr98Xrs7O1ePYy90MWDdXbP4c7U9Q71rUXr5HAba2Y1ZDWqszGwFuLOtPIwXTq23WxxPLsXNTaDy/H4ZEyTP6YhwZi+k53/AWFEdBeW8pVXWjSrcCTPkXTUNZoRVoRqOttMJ49TgYGs1zKSw0k4F+WbVPF2jrY8nSbuVEx8HhLgNo00IDKc2vhAQjssPN3cu7u6nuhgLjiISCH5td+cz1tJXwzfF7CM+AujOTMhj+s/DyO6ev5vps+42Y7h6itMCSgx2W/MYqip8FWZKKw8NbI4l4SP5H4K7ZMBLdKvw7JeWY1izC3LKCY/+sdUM2/JwE9cRfnlQisSSz4RuyLaBv+oJko83lD4Q13OMT4M8JkAtr2ejeshA4LECM9BXS+O44/m60b/VdSviKOTkkCJPxvoqi3w6hT9Z+NObiL2hrOy3MVlHVp67lQRvxZngRkOkNFsc2VmKUTESWZS5ZRuMpX23hECA/1QyweR9FTk3wYnv2iSL0BUyMy9R+Ljj0A7oQDL8/Kxd6hQdk+g== X-MS-TrafficTypeDiagnostic: VE1EUR01HT062: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R9RYeW05Ws8bCjAPJ3Mu0tgFP+01m3LsB/Qz3nCvmJSpdeoJaVfDxJyRHNuIAoRm+AAscOQw5LyOqkSdlJ1/hXfCGfWxnCKnEfLn9rN/ZK3FvE2UMRmSA1oRn0SuQJ+Iki8FQf0H48cXw9g0G812IW+jeszcH2zrROhRtji6MWnUQLdtfLJuXYkOVJFi1BpIGjS96sbDOXS1z9wZOAIMX7BgEIw0gKgosM0uiQ4P1SxTg6lPhInh+Qx2BCcnaWd6qLVSYpRJpAJCCLSwMELpLfvW0OnvOoJgAvbmyYoFWTveyzVDoFqA1PPf5aFf4QVWTjEKFYRXb/CUmIDSNPJOf6Ct7KYnadlJG0pasEmZvSfuIlAjneuSbM3SHiiQ7wCqUd4eIpktKZNZy4iz0m/dTg== X-MS-Exchange-AntiSpam-MessageData: SDMEYacToYw1kz7jJqd6/SAG47GE36RbCHtG62xai1ZfXJYuMXaAwSekNSJ6MmTkw8HAFinpEwPucRVe0KTtWYgspbG5+TlSq+h8H/ZEFlmvBIJ8XzOK6XsoRm/BWRXKY5jA3P7kkBaVJYCRftHZPQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6880db7a-fffe-4c20-afa7-08d8ff66f93b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2021 17:01:40.7879 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT024.eop-EUR01.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: VE1EUR01HT062 Subject: [FFmpeg-devel] [PATCH 2/2] avutil/cpu: Schedule deprecated functions for removal X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" av_set_cpu_flags_mask() has been deprecated in the commit which merged it: 6df42f98746be06c883ce683563e07c9a2af983f; av_parse_cpu_flags() has been deprecated in 4b529edff8934c258af95e5acc51f84deea66262. Signed-off-by: Andreas Rheinhardt --- libavutil/cpu.c | 3 ++- libavutil/cpu.h | 3 +++ libavutil/version.h | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libavutil/cpu.c b/libavutil/cpu.c index 8e3576a1f3..bdac454421 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -102,6 +102,7 @@ int av_get_cpu_flags(void) return flags; } +#if FF_API_CPU_FLAGS void av_set_cpu_flags_mask(int mask) { atomic_store_explicit(&cpu_flags, get_cpu_flags() & mask, @@ -192,7 +193,7 @@ int av_parse_cpu_flags(const char *s) return flags & INT_MAX; } - +#endif int av_parse_cpu_caps(unsigned *flags, const char *s) { static const AVOption cpuflags_opts[] = { diff --git a/libavutil/cpu.h b/libavutil/cpu.h index 83099dd969..18dfa492ef 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -24,6 +24,7 @@ #include #include "attributes.h" +#include "version.h" #define AV_CPU_FLAG_FORCE 0x80000000 /* force usage of selected flags (OR) */ @@ -88,6 +89,7 @@ int av_get_cpu_flags(void); */ void av_force_cpu_flags(int flags); +#if FF_API_CPU_FLAGS /** * Set a mask on flags returned by av_get_cpu_flags(). * This function is mainly useful for testing. @@ -106,6 +108,7 @@ attribute_deprecated void av_set_cpu_flags_mask(int mask); */ attribute_deprecated int av_parse_cpu_flags(const char *s); +#endif /** * Parse CPU caps from a string and update the given AV_CPU_* flags based on that. diff --git a/libavutil/version.h b/libavutil/version.h index e88e1ad08d..4e5bf45cf8 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -135,6 +135,9 @@ #ifndef FF_API_BUFFER_SIZE_T #define FF_API_BUFFER_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 57) #endif +#ifndef FF_API_CPU_FLAGS +#define FF_API_CPU_FLAGS (LIBAVUTIL_VERSION_MAJOR < 57) +#endif #ifndef FF_API_D2STR #define FF_API_D2STR (LIBAVUTIL_VERSION_MAJOR < 58) #endif