From patchwork Thu Aug 31 17:41:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43414 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:299e:b0:149:dfde:5c0a with SMTP id f30csp426680pzh; Thu, 31 Aug 2023 10:40:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGHuXl+zbu5RgMrKLrpQpSoQxsetScYdycaemJJt0YvD35JFZMfeJWsjO0dYGEhrWEE7mFr X-Received: by 2002:a17:906:845a:b0:9a2:256a:65cd with SMTP id e26-20020a170906845a00b009a2256a65cdmr32912ejy.4.1693503657538; Thu, 31 Aug 2023 10:40:57 -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 f8-20020a1709067f8800b0099325564b77si1216698ejr.548.2023.08.31.10.40.56; Thu, 31 Aug 2023 10:40:57 -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=AO8gfaV6; 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 D831868C7D4; Thu, 31 Aug 2023 20:40:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2099.outbound.protection.outlook.com [40.92.73.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A22CE68C718 for ; Thu, 31 Aug 2023 20:40:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hq4zSKbGCyEmjv5mCx26OXf4BVgUWNEon0+NrmuRJL0gJb1RoV8Jlm39wi+OmGJiwe8lf327+1/Bmz2rEfl+H/ZaVwS+LcjrDOLuVF7KmQJSiZ2i97r187h7fBGNU5FfPNEbVnvQ8iC2CxTNLXr8Kch89GwuNRpr7ChqVvFF06gMuv11rYA4MN7CUUsybO/qOVLfpGsre16uv2MLwBeuLDSylIDRUIdZx73hAkabSHi4amr3s/B+ZaoBWQDW+P+hMuDCr1Lm+HnMAivUViBVCDwn6Srzi1l2lY2+ESVSdgTy1eG1O9QsxHBTZ/oZUP6wzhM3Jqfsygu7hg5/tMkoEw== 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=6eULoQ7Q1HzG7DtrXC9M7f3SsQn0NKO1tWepAKsj7uw=; b=Wx2dmW5U8yLlRFyrg+PdFC10hsQ2grur77vXMBI5fvR+vWTR0/8IEXdCBDzkOi+evJNTqVpzSF+S+olATc0drip8dOPnynHyIIn/WL2tSihKiMWy3kAfUD5xpBsqhA8u5BFhlX2mGmQWMgjAtlXhnVQMBSMCnkTgp4OpcVX+k/qFzAmbjMJiMLVnz9FOsosW0AJDVBBx7gREQ/MERbPV1dZthEZaXdWCBhVyID6N1f4B6gC1Oz6XDE6BOM4fpAajo9FAJsZDOGZWIS6nZhZT7hoJmgJy4Fe51U6wQ9SXMrWApla5RV5IEY52R47wJAdeAzkJLFWWO24+hC0TDl8s5Q== 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=6eULoQ7Q1HzG7DtrXC9M7f3SsQn0NKO1tWepAKsj7uw=; b=AO8gfaV6DQH/5P/nFEw3mPDUxqO0AavWYOFNWdVyIeQO2Cla95FL6ghLjptF/O0yTH2mMgEL7A//VsDZX6wUEbS1IvRwMpQMiqciZsWbF08hcMQlTE2DaUyoXE3MzBotIEcpIOFTFIdPO+Udqfv6iDH7GYBRHeb7r5kJIlftgHUEyEDL0X3ob8+KLvBZvUDiw7ug7HXkDTBEDb1dy0Kbo4WGZhxt5SVonU4xFq8vVevaGWllCOrp1ErFoJOjxfXyN9gyJHF7dDfhD2Uuz6Hwa8HcQZ2RWLjLw2StIex2JzE/HjNfw2YOOBckItO8r7acOU9CneXKQ3luPoNW09Xmbw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0408.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4aa::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.21; Thu, 31 Aug 2023 17:40:46 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6699.034; Thu, 31 Aug 2023 17:40:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Aug 2023 19:41:56 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [YmfFz5mMf8K96ycytn+0J4vtiNtXU1dhlhkeipUr84s=] X-ClientProxiedBy: FR0P281CA0121.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230831174156.3913412-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0408:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d70c993-b3fb-424b-04b9-08dbaa4967f7 X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvvMJrI8b7LEOlK8aVzXDUt94AyUCtCnnHAc8eXVb7Sby+SIQBtAimhA/IJEe3KHC2y9pvl+n7MshgBNpGpAYrRd1OOlB0/QH4uZqPGOW73SzxISwBCx7YFAu/zaE3X/hh11u8GDLHZcEe0fN2Xpwo+YNyDDiUWz6P8e04mwmnJTRWoRiXltMRVAr79IeS43wCWfK7cfP9QHcBHMeu/6HPt3oqQBHK3GFwcrcJm3hCD3kC1lVxuN4IH43c+zhvYXf9ATP8pIuFsvoCNd8OaqMxKq6gBOnHuPS6Qp8xSf3/KKUdu52VjJAV5A9OBmXLcZjtMKkmNS18o6mOxOkt4nHOtd7JBcBcxP8k2Omr14ajKOqlaFYvGFJpKP7l3i4uHJ43ZeY5Yi2yk3YUg/BuKXfaXGc9qEZrQZ1QOh2JflBzUm44zWZ+kGnnX8KTtXwfKVJ5zFKf/L6v4N0PftnzRQ/8wSrfoXs+RcQSuD+TRjLIfzYTX1lk+rMqIk6EdZ7Cbk90uH/oLA+YuAdzelFn2SPstpl2QFFG2hsGV/NprESXGRCpyWgyOr9j+ccOzNBzmUaFKRvE8Pmb4uiMJcjMLs7gIm2MFjuIGmjRybMTcHdfLo0wWhJsC9PjwcycXO8ElXfrnOpTfWtDeDgfzhdtXDOAF5Uzx1a2rl3DnSn+UQ2Jq+2RUWSkqsxqM1ilp3nMH7nsoEIbUgGmhMyT8t3FIoOUKkq9jdQaIqVGLEuL3vbaLoko0Spw9syYvZLnIKVxl+kFM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BtWIubqqykA3IhI/kX8+U/G5zDjm2vL7IKe6uEyskpAabfPiGyU50QW4yI5YNVfUoLgrfPuUEXzfcsqtc2gnBOMYOwcAlnfzTUCP9zqJEeGx8FFSzj5IRTc6eKBklEgTckSUXCcaHbJAIF8Dfoykw2gwWJa6PMbmIGnmPGNNIA+pFH7v3LcvWw/CF2VCu4TSs4cjwxrzRm6AkeHhVPRRvsZ6qT6nL7D5p6FTtnGAs4ypTuBxkO14AQ34uXIp5YjmZNvK/+++XOsDjOzFqAXGgglzlfNNAIRtYr7JsMZWguH9hujO6gdL5b7P5HmHIY0WbWTQMdaY1TzGE2i6PJIcqmhNtNDHe8mmr14TnZF4R4RvZxMKugDWD34tUtmUD5kl8adIdmwo5X7xQ2fwLEaPcEV55WwNURTritP6V50SB7Cp7/w3C0VANtALHkiQJe+9vAtHZu7hD6WsVfbRPe+LtN6JebCcLX70vQM/yJ7I1ctnVR8XIOtUbDWCIwaPlJ6pF9RGrddi84ciiKvwzrJavJYrzGr6/kYEnGdtXHHuK0bWfP/TT6u0JpMcmm9ToFf7GrCBBwlNigV9MRBkWJTu0uVjlks0dTGuly5hY2soFztLQrGJhCVAYp7qzwMCvpHw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ru++yGrjf3F5LLB9HVSyKJYxB54RDBlCG8Fahq0vN7djxt3wdzBbePFNbv7iRhukUKyuwEY8koTN8dRvcFB/rR0WitnCVxAJfV8ZdF+9iaGJeyyEdxBfDxTPxRJ612Fr9DYwEWFmgAAKiR8xhwfW/fXYwd1ehil2x1wH+p2XoudZg8/Den9Hqr0yhDvilUoWCaIgfWGh2eTfU40OUrqhk0ei8cktMON1znlOUoDhWr1QOIOENnWP245I03OwqMCHtWd97cbipqFE4PR48chX2l9Im+6Y9OnVysGk96mAIJ4XFx4FxzM01AD1Yh5M2xD044irEyHAkSP0XG4Onjt9btc75FRuTMKB3YZ1h9GbY9e6zampfw+620by72rNsQgQ9NqZIsNSNFHg3zn2Ocd1iJFwGnxQD3QdG4QIu8bNL35stIQQMkO5/gtsdQmj7n+DxxzhJM4+1/KjQ+G5RhQ6kpxiQm/ku0XIePwBnc9DW/0uwGI6PJ5D1Wxj/Ufm6ABw+cQBuwIjJvwomwFNCR89rZj166UYcFLzzSj92DvE0qoFpsFrXUB+j6PRzvCkVft6SIQrVTdHgZUbOKfDv15EaX0kz6a+oSU8yshIbr/KuyY3GA443v+unv6RcjY3K/j3z5Sh9maJfR17gFjuwSgBVMRJfBrUyVtmLhyZ10ryH9Or5tBWtRKI/asjjvNhzJANu+c+LotDJpRaCsC5TKodETW5kScwoBPwmyCmj0ghY9KLR3fOasD/P5Q7jQTJt4CqLFOw7YQCufogjlloiUcor+rU+Ly1o9sbyyR/dbWSkX9/bKuhv7QMDtLJTvi+uConVnrQFEyGkRqD09Aon7NQc0xYnTgi0u2C2rO43LOxTYOpe+X9JgTuJoodwYGblZ7ALcdPOJ9R2eAsBIYuaWxDqftTtahlvKB6jk9mWA9RgC8lHdIrbjjHIYnb/1yk63seKjWPsmF3CgdmqzbGRoqi5Lnr7MOBSywXo6j5hgzF4vGjasuyWICX5PI5B5LiB52TqbS4GEfaBEky4QnDHo+pd5BB/fdF7gQGCMKgucj2/Lvyf1JphOCtbgWhWB6aOnxmnqar2riKQ6j6MTx1EzoEcutUYZ6CR74FHmIXrAY40FjXp9CZOci4I1q8C18WLJMcXtW/3psfK+BtztIHaCKM4yng//9FQ4FihR9q9V2P5CD24G8rQN6OZM6LvQhJA5uYHPU2vXLtMPyYdhCO5/ifO5egYUq2opiUB94BEzQlc8f2RQOTRCHpn7BNVXj8IVBn X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d70c993-b3fb-424b-04b9-08dbaa4967f7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 17:40:45.9235 (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: AS1P250MB0408 Subject: [FFmpeg-devel] [PATCH] avformat/internal: Don't auto-include os_support.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: jKea6HVjbk+6 It includes various Windows-specific headers when compiling for Windows and these sometimes cause issues: E.g. winbase.h defines IGNORE, which clashes with a macro used in the Matroska muxer (since 884653ee5be03ed38db957c14fad51b300611c8c) and demuxer. This header provides fallback defines for various stuff that is mostly not used directly by (de)muxers at all: mkdir, rename, rmdir, unlink, access, poll, pollfd, nfds_t, closesocket, socklen_t, fstat, stat, lseek, SHUT_(RD|WR|RDWR) and various POLL* constants. Ergo fix this issue by not auto-including this header in lots of places via an inclusion in internal.h and instead include it everywhere where the above stuff is used (most of these translation units already included os_support.h). Signed-off-by: Andreas Rheinhardt --- libavformat/img2dec.c | 1 + libavformat/internal.h | 1 - libavformat/rtsp.h | 1 + libavformat/utils.c | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 15fd67927f..2761cb37a4 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -36,6 +36,7 @@ #include "avio_internal.h" #include "internal.h" #include "img2.h" +#include "os_support.h" #include "libavcodec/jpegxl_parse.h" #include "libavcodec/mjpeg.h" #include "libavcodec/vbn.h" diff --git a/libavformat/internal.h b/libavformat/internal.h index 594afd731d..53e70ccb53 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -26,7 +26,6 @@ #include "libavcodec/packet_internal.h" #include "avformat.h" -#include "os_support.h" #define MAX_URL_SIZE 4096 diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 6e500fd56a..83b2e3f4fb 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -28,6 +28,7 @@ #include "network.h" #include "httpauth.h" #include "internal.h" +#include "os_support.h" #include "libavutil/log.h" #include "libavutil/opt.h" diff --git a/libavformat/utils.c b/libavformat/utils.c index cf4d68bff9..c722743744 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -37,6 +37,7 @@ #if CONFIG_NETWORK #include "network.h" #endif +#include "os_support.h" static AVMutex avformat_mutex = AV_MUTEX_INITIALIZER;