From patchwork Tue Feb 15 17:43:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34323 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp512685nkf; Tue, 15 Feb 2022 09:46:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJyPYXN1ifhSz4XSyjLS/ZYl+8aMHis+hxsF8w3LW/QknlRDOLaEgOU7AaPZYA7rI90EWo0z X-Received: by 2002:a50:e68d:: with SMTP id z13mr10247edm.307.1644947172506; Tue, 15 Feb 2022 09:46:12 -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 h8si319293edb.84.2022.02.15.09.46.10; Tue, 15 Feb 2022 09:46:12 -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=BWFL2O0d; 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 B2EB868B2B5; Tue, 15 Feb 2022 19:43:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2039.outbound.protection.outlook.com [40.92.91.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B08CC68B2F6 for ; Tue, 15 Feb 2022 19:43:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NWU5PWMeyyhJmKe+j1FybgTpREWauE1+tVmhagD++dKShWrpcVx3jB0F3NcfQQEp0Gv6MheINQnb76Xn0gCQQJgts8NYTOhUIXzX7bh61A8mqvi9wie3FXN1hZ2tVs9qMUsY2/aKrQD1inWQMZMluI8qnu64c7yUWNQ/MC1VtF5mZiyIZKmD2rphP6n5sz5thWvhoefNFJBGAMjhSMaLhf/ZNPP35dqwmuId3TN+a6H1iUUx+WXR6D74n8ftKaSpSuhM3xIMOClozpYyvUl8egZXdzBt8MOib5WXdXr7/t5fxQA0EODIDwZvg7tUpvvGYJ3ZuyplI15eq3gG6Cp9Mw== 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=B22x7PdUPfEdFoDywS1OT8d8twfdb87abEypKJ0tmhE=; b=DZGF9E3rsOxM5K4Fq3oWsimW48gu79AsRdYuEw3NHgamWF+TlMksd+tOoM3IP4XEcP4phQJYNGIOuG2foL2ffsl8E3wTzma2uBF60ZJZYsgTEne6VBtiMXIb/Eb7i/k7KiS/YBweN8BnJPHQ2YZmgKdpsMaYjHo6CeBLiDlt1waDYBEI0IccJu1AVXbeiifjIhCMcxxgosC3vB8rrqOf1uVrLV5NnEGZ4mdSILzDyktVi6MdX3IEc04oY3+Mcomzncf/YeyAhVqy+ls78JBVZaGRyE1OC2WvBY1ruzH6VuLzZD989LBgik/9hfq+zSv8R2CHYVp/a0hy7ZYKLU8zlQ== 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=B22x7PdUPfEdFoDywS1OT8d8twfdb87abEypKJ0tmhE=; b=BWFL2O0d1xXae/zhgqOJ/h7bXKkfnV6ZRFmm2q00MyKEzqqHdQTP7DUFuZ15BgAsDcLf5J+EIutNcdoLp9O2CNhjVwDG+v8KJyt5qTuGIOaJzjOzCmOGp/adHzL4J1TzAri19WwvqBXXcuFSp4B0m9QFcaCANyVwMVtugwyucRmndqQHIAtt7SVNQ/8paQLLGPMjI/MPEpjM8GbgoLJHMxGvA0C8zISPSmJY66yTXvvabLnztpEgPzOA0hXmJEhb/NYM6b+eXc8bSaQvO2tOKoT1YijaMPbXtcJPpUxQymFGCo7JRSwzy+Ixka71677bmqFvDTJQszT35/wtGk8NRw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4359.eurprd03.prod.outlook.com (2603:10a6:20b:a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Tue, 15 Feb 2022 17:43:39 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:43:05 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Rn7OGznySttE2XHXE62SM4uHmSPk/bSx] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 079c8874-5283-4910-a69a-08d9f0aab34a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVKLwpMcprvMJKpcsYktiuOgA6TY5S1oVeh1N6NSKz25ov6IBLRdSht8phCN0rmL5hqRx0tHN9dAFhHuJ9T5K+AH3zO0w95G9+nApmLzxUiDx64RyfATav4cK9/i20VCCt1WU587DOs+rTeHtDjlkczMLBsLNaCVGCpNR3P/3nc9NxyXNF2mVItniuTPK5Pf9MZgMz0XANNP1GinYf4ZUSjZ1cM74oH1F9ZnakLJ5XLt3rhmCv3u0N9Df7lntIWPXwFw8RFit5OVWnTRvGsZR2BCXTUnN1qdTXXKClKWzC+9YkhCnzeLEuGFYePinSmh6a/LlmyaSa5yXs+e8KyyD3VhQ7nJCFvi6juGyV4yy+Fw2IExQyCLeC6vEVcgiDY+Zm1BPbZ6tgWtDNr20eNy5IkN/aYyISMUnavqPMPEtPtvk97ZavcC9FuF6LKdDXX2JdwmbvmYUQ7Tiv219nhhWeX/kXjKHGcdq9HouTKfknEOl4iPpC2xvQl1MI8MHLj34oLfGzVVI1FnVmvXUlCj+V3VVS11+zbfB7Wpz2lQ0Pbojzis7XKasGesh3riR1xaLfMZla8jVFpphLAE0K10yVuL1aMLRNJXPtQ5bdp6uaPCP+cW0AFi8rr3O/wjvK1kVIH9Vcb0W1E3bfIY124y+L8XNwCQq0rt34X5ctxf4onfNhj8CVoePDPm7QxVVCJBbx+fUdkNak3X82eN3ZhPFoKwTeX/stu4OY= X-MS-TrafficTypeDiagnostic: AM6PR03MB4359:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KkKhIJe2KIbF6N0Td1cRAC623gP3aCeSfI01Pa/6aH12ejm2GijDBZdSGw1WYU6xdUcBRMCkUOtX+O8alLNolpJt7pyl+bD/D1KTJiQbPdnlUiL6fpbtzw9dg90XTzKdVdPmOUArHABXffYUJqJWgqKDIBMfQ8RBFhQhSY460E2Kbtx38VvR7ta4+HgRWFWQkn6qHMLjcQjUbyXwY/MWwx1GfWJdF4gtpXia03jHW2GHODKJQrS4LcjNR7uBBnbW8OUSGcu6sPA8CNGzgxEgb8Ebt9gi4/zuCrNEYxiVkOoZPWaYq4Wv+Zl6Ma7D9g6r3pssRNoBYBmuPLJBEtWtuLnqWW8fEOOehtRb2freUm8gpva3EzxUFOY24lH6aunIBdUvU5QiC6RzZD7cbQFN743QrPEBXS/Zxg1QSp/vFTfEK/flSwHoWuLc5Vd6L9v42tVWV0Q587sYUADgvoSBL0Ty+cFE9/6auPMB1QPuDZBddW6/iBJ/ZM/n2bIV1we+UivJY4ozX0JnfAbmU0ba7yDciDZI24jX2MKkfxbGXzkaiHeCRfcghjg5iECD592lVf+Ur2GqrVp611k75eOPVg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lBKxsEPZnNs/4Yz5mdz0sskw8dxFhCtwQbXlJ9PX+dXanYOVFf9D1R4PHHm/r57VM8QuB9TlTKyoiOJDhmbqXZGKPgsBabiWFQsvaY8xqj3R4Yt8igS/QmS/tNyAOPukw5otkHTNxDSmQSgpGnU/3dFmDohLXo9YkNvT5OyIRzaJtqGdGWQXTId/kK96natGMSKHzY9fID0UeQpWoJdgWzQtYT+GNX7wAf1taR02GDZaQuTJ5ZtQJySXHcjak3Imh6KDE+ba78TMZir+UStJrdOtiW0UcFnJcWLQ12O3T1zOOTLT5bDrZp2ZeqY4WlTEzSVqdmQfC8PZ+aitvE5456QY4eFpjGaP75JGYE/IeI4i75fOMf7YyqINugqCsa3+lFha3lJmbMkkGi/ADpkmSBY8AIopCZTSM47IZjFnoVWo1voq5nv4jdg3qm5Z3OXWhK9Ec5YP4T9coXi6H//2luIqvDLoyOtbYKpNh7gkRn78hFM+5iPVo6hz6hAAQLh8AOG8jisb5pwFbFCsGh3rD1yrZ0YKkgg9YpUWz4DnsAHwniYRQ0+HCeP3CF1C7tp7I4utnK3QNjxiTwt3s00AnZ8IANhnYP0ndSwzU2BuyWynhaoRFm/GVH5Si0phP9aii+Gd4oCtJQakaVaQPdLK187qV1B9gnwWCqGCPMNxKwLJejLg2MY7HnTnb9grYgCCQF3oeN5T4LAlEmikvFL8hUexs4OuvUA5w/Oo77jrLwdqnaA8OOLidz/vUIDNPgLlHuOVidysorHMPHZEqGZTRjv0lN/XWvCXp5117TAuLcQ0+t5QsAsVmfbQK6z4cu1X/DZhUWHeQzAYP+APJGf3bJQXPV4lNroYzNeMIWW+OQJWq8dccVkf4SU7RjXs0ZHpeqy8lOUqhpYfRKTvmS3vaSwJVACTEz0fpNRn/lqfNynFQ3FP/zW8p1DgykzWcezlhZ8YC5KqlHBVWtIyHLTbcg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 079c8874-5283-4910-a69a-08d9f0aab34a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:39.5268 (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: AM6PR03MB4359 Subject: [FFmpeg-devel] [PATCH 17/19] Remove obsolete version.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: 22IwwXyi6DW7 Forgotten in e7bd47e657bbf9e1ce9915e93bc80cb1a29fb7f3. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc2enc.c | 2 +- libavcodec/x86/blockdsp_init.c | 2 -- libavfilter/internal.h | 1 - libavfilter/vf_swapuv.c | 1 - libavformat/url.h | 1 - libavutil/common.h | 1 - libavutil/internal.h | 1 - libswscale/swscale_internal.h | 1 - 8 files changed, 1 insertion(+), 9 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index ccca78d281..bfa43b3c03 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -21,11 +21,11 @@ #include "libavutil/pixdesc.h" #include "libavutil/opt.h" +#include "libavutil/version.h" #include "dirac.h" #include "encode.h" #include "put_bits.h" #include "internal.h" -#include "version.h" #include "vc2enc_dwt.h" #include "diractab.h" diff --git a/libavcodec/x86/blockdsp_init.c b/libavcodec/x86/blockdsp_init.c index be3eef0021..d7f8a8e508 100644 --- a/libavcodec/x86/blockdsp_init.c +++ b/libavcodec/x86/blockdsp_init.c @@ -20,11 +20,9 @@ #include "config.h" #include "libavutil/attributes.h" -#include "libavutil/internal.h" #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" #include "libavcodec/blockdsp.h" -#include "libavcodec/version.h" void ff_clear_block_mmx(int16_t *block); void ff_clear_block_sse(int16_t *block); diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 1099b82b4b..53883101a8 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -28,7 +28,6 @@ #include "avfilter.h" #include "formats.h" #include "framequeue.h" -#include "version.h" #include "video.h" typedef struct AVFilterCommand { diff --git a/libavfilter/vf_swapuv.c b/libavfilter/vf_swapuv.c index 27d083f026..4452028262 100644 --- a/libavfilter/vf_swapuv.c +++ b/libavfilter/vf_swapuv.c @@ -25,7 +25,6 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" -#include "libavutil/version.h" #include "avfilter.h" #include "formats.h" #include "internal.h" diff --git a/libavformat/url.h b/libavformat/url.h index a129150d76..3cfe3ecc5c 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -25,7 +25,6 @@ #define AVFORMAT_URL_H #include "avio.h" -#include "libavformat/version.h" #include "libavutil/dict.h" #include "libavutil/log.h" diff --git a/libavutil/common.h b/libavutil/common.h index 3eb9bc5f74..fd1404be6c 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -41,7 +41,6 @@ #include "attributes.h" #include "macros.h" -#include "version.h" //rounded division & shift #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) diff --git a/libavutil/internal.h b/libavutil/internal.h index 0a7f1c6257..79c2130be0 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -43,7 +43,6 @@ #include "dict.h" #include "macros.h" #include "pixfmt.h" -#include "version.h" #if ARCH_X86 # include "x86/emms.h" diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 3a78d95ba6..2be23458a1 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -24,7 +24,6 @@ #include #include "config.h" -#include "version.h" #include "libavutil/avassert.h" #include "libavutil/avutil.h"