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