From patchwork Fri Jul 23 17:04:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29035 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1560847ios; Fri, 23 Jul 2021 10:05:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXYtyYwZakjf2cRPIRntkFRlSY6Bku2ePiIV8NWFdjIrkiwLSj1O7Y6vi4zEBDJWlGCnkK X-Received: by 2002:a17:906:f294:: with SMTP id gu20mr5634184ejb.292.1627059935053; Fri, 23 Jul 2021 10:05:35 -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 ce9si30507086ejc.253.2021.07.23.10.05.34; Fri, 23 Jul 2021 10:05:34 -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="lC8G/Swu"; 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 AA77368ADF9; Fri, 23 Jul 2021 20:04:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070040.outbound.protection.outlook.com [40.92.70.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6428468AE42 for ; Fri, 23 Jul 2021 20:04:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oB1SSGXiiAjeWLaeuuZADrtwLobPAMy2CA7yippycJEznaCLvHXj1CBPkISlV7Sk1rD0qiaAZ39x4/Pzg4nZ4hfssniFLv4mn61oPuva+5CkHVuyBtNb4MZFgIVfhHAFtbV9JJx+d/pNWydShpZ51+CM8SuN2Zjbvt+5DWyDUP3ziU+U89VO+BHaYdt1JqMvKMXH6+XbEKz3ktUEiATKedqU7W8rrhOBoCAP4cCFbW2rH8vViAOGqoETpOnNiIs6c61U1LnszUQ/+rwkzhiOLOKzXzAE79RsSms8fgrCqCbwCwSB4xX+K/pyW4q+dY0i9XZ9LyGuqbXyI8ptL1BizA== 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=kTj+41BjnEejj5sGcpVCOscmhoVjBeTNrsGR/fGcMbo=; b=mDf/WMMlKRPp5MsdPRRIx+9DlWOpsIZTO7IS2qyDiGA0NCQ6MOMRcSnc2VN3VY+3+Ts8FOvY33vPdhUlOC1ah78c1/lYkH3sJBNAy3Bwd6R06VZW21EBWaB+y62cBFs0smOhH9tCKKjVJt2Lk42kndrd9PE+9U0NsiPMS15+v01CjoOGOmtqMx6dwo9TVYYU9qck+cWmLZFPP95T5c+JBrHKVmFEd5qKXP5N3KC7ZB1ODzyJLfciNXTYDyDTIsDVimn+sqM7f/fXdmoCXYQcjYLyqV3sH9a1HBF4Xwr05z5XyHAYPNfNQ2a0mYzXA+h4hqrNM3qe+qFmgfVzOAsBMw== 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=kTj+41BjnEejj5sGcpVCOscmhoVjBeTNrsGR/fGcMbo=; b=lC8G/Swul+CMST51ccTQugyAPWTNdm5u5oUTdvBaS5j34sYkk3u1RFCaZmw+5irCLx4ebCUSfXingFfxPlG12Qv+JhdgkhNMHtN+0Hu2zDK0z652cIXLOaeYHiM0E3moFmvwQW0fTjg0XAuXV3DcFuQ+pmwj4ycQaqSAYxho+Cj4fhxSegNvUgmAhEsOgrrIqaONYEQi0KKXpeZY9UkBAfODWNf+rTlpdUsjW0+B4KAjffu6Dt/R+Ai03kwSCoGDODQWyKtG7yvQR8odBh3C7NP+jqwVYezqP5MDTeP5BBviLF9/EgYY8lLNJsmNZpr8wTzNuO6Fi33Pjk4qCuGRmw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (10.141.218.86) by AS8PR03MB7045.eurprd03.prod.outlook.com (20.182.240.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.25; Fri, 23 Jul 2021 17:04:48 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%7]) with mapi id 15.20.4352.029; Fri, 23 Jul 2021 17:04:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Jul 2021 19:04:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [+pbsJc+5wwcVLEnUuPD/co1Y9sFMTT+2] X-ClientProxiedBy: AM0PR02CA0025.eurprd02.prod.outlook.com (2603:10a6:208:3e::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210723170428.1653805-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM0PR02CA0025.eurprd02.prod.outlook.com (2603:10a6:208:3e::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.25 via Frontend Transport; Fri, 23 Jul 2021 17:04:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6dddfbad-5ca5-415b-71d8-08d94dfbfa29 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSTXlfHHyYgl0A+SM0x/gy9OG6IRTSKWWl9j5lfPeqyxFAVhAJX9RTPEYm8Tai9y1bsBFfSggdNcMhHPHC8RlpM86+XxpgWMN077uqoIYJgYJeituryA19gbZwWBOASqQolmaSpzilwOq2GT0vNwyUxBffIIR5Cah5ihUTAHhbmGwO2GxRQDxH6mA1ug4qth0ANZA98IFIF92cFERXVLHdmwZF/qv4l5DAhwqJ0Yvy3rrFcnXoWFLAidyPFACMm+tkIaah0GdpAdP6nxAXiyxidtSJN5yvy7ngAk251auNKOFAKHQBwJ7nUqYjFrvBGxZFAeeiHf9B5XurhKk6PhjeebySxAiVSyWKPdQqbZk4dlE19QqzvQfoVqeS5bkwiKhf+XTFZvEM5EJ/Iah3i5/R3NQB7ZbuVwj7MdhM0xLwR2KJdpmVGfdTun8RDmvr7RITPwkVTkvv0TOm+Ao5JL+fps9nUx7vsJS/WgNU6A6xgWmEaGyRi0in+ADTSfghwPBuLvhx2TXIb3QPFQvXSFGXq1dnH7EKHWFTDpu/MfJk2YT01/PnF/Pm2FCXPtIjiUQqt1WVXq/taJLJsDMIHVEftb11hAUr8WuSAeJrkQUvdO1ezPujHnTlrf29hozzyolgCIqeXcUgTygVfDFgh1w8gt8qIIbOzT4cAfooNoXXHR5Jhe9xmK3xQLbif3x26KNFi0Yiu2OzojEJ98DmFvm0M5dzNILtY0cog26Dz5r2XakBsy/mREMD/KSsbTw8ORUU= X-MS-TrafficTypeDiagnostic: AS8PR03MB7045: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WYJSlUXOSTEEhLhqqnXj3qqcLw1qLuYFQ/sbtGpHXBexMWnCl3SfV7v+kLOzUK1n7gxB0DVRMLzQkZ5SCWyREfEGO9L7wGx2fqM7n3uk6zb8YOBv0eXSUNGlcZxtGYKNzw4ovkP82BfKy4Qs79/b0RTf+3xzLNOa8+yVU7hoXMBN/e/E/WOVavwGF8RppRE3Za4cfubpNVzOP/w4TyPUaqr95OBh7v/jngoC51PQMGClezDkC7bO4ekABFdqJQJqecZSl65YTMuplkTB6RPOJdCU+Jij0h4dXt/KUR3d5WDVZ+eaOVQSItTWnbCre6zuh6f5lCzfPRQtwMl5/W3+JEdREj4LJGJV7Jd19Q6Xut9Z2is5lLgzW0OeaWdE4Mjs1fjHQNVyFCo1ZXZAwb/6IRz2zIUw4plsccTymzRXfuD+50AnyUelIauy5XRRm+86 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LKxHpnVwtY1SnvUjIQOl5xEZOwgsPVdLBmymUP151dXAj90DSsmjlW5cEZUMh2U3TP2tbOtHDw1V4TnEymUpq53gS2uz7cNXI95BWxItL5FvNsAkgRFnxnPG8pkUMOvc88aWS5Mih9Tu2GoL4iRgMA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6dddfbad-5ca5-415b-71d8-08d94dfbfa29 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2021 17:04:48.0946 (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: AS8PR03MB7045 Subject: [FFmpeg-devel] [PATCH 5/6] (postproc|swresample)/version: Don't include libavutil/avutil.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: H6j3jLrRjV+r Instead only include libavutil/version.h; including avutil.h is a remnant from the time in which the version was in it. Signed-off-by: Andreas Rheinhardt --- libpostproc/version.h | 2 +- libswresample/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libpostproc/version.h b/libpostproc/version.h index 3819b68997..e518ccf810 100644 --- a/libpostproc/version.h +++ b/libpostproc/version.h @@ -26,7 +26,7 @@ * Libpostproc version macros */ -#include "libavutil/avutil.h" +#include "libavutil/version.h" #define LIBPOSTPROC_VERSION_MAJOR 56 #define LIBPOSTPROC_VERSION_MINOR 0 diff --git a/libswresample/version.h b/libswresample/version.h index ed7ce529d2..5f0d69228c 100644 --- a/libswresample/version.h +++ b/libswresample/version.h @@ -26,7 +26,7 @@ * Libswresample version macros */ -#include "libavutil/avutil.h" +#include "libavutil/version.h" #define LIBSWRESAMPLE_VERSION_MAJOR 4 #define LIBSWRESAMPLE_VERSION_MINOR 0