From patchwork Mon Jul 24 20:47:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42951 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp2176541pzb; Mon, 24 Jul 2023 13:46:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlHeJV+J6rMqC8Iji/SMzQcYw5+UCCxR3DxkYIWGb5zGoNJeIbX4DDDFQca0znY94q13k9zJ X-Received: by 2002:a05:6512:32cf:b0:4f6:29cf:c0dd with SMTP id f15-20020a05651232cf00b004f629cfc0ddmr7743669lfg.8.1690231598709; Mon, 24 Jul 2023 13:46:38 -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 d3-20020aa7ce03000000b00521d1c34b1bsi6668689edv.189.2023.07.24.13.46.34; Mon, 24 Jul 2023 13:46:38 -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=s1oI35Ud; 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 7BE7D68C7A6; Mon, 24 Jul 2023 23:46:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2084.outbound.protection.outlook.com [40.92.74.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96DE568C66B for ; Mon, 24 Jul 2023 23:46:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LAI+7V3s1cNQOQkoZeaXKH6ZwwWuJgBMxz8XJLbdBEhza/T/lyTadS4U00fvHBWq3rEeBnRNJl7xFnKyCiT1FxaJslUAyEEnRkG2o5ElwotZwnIV4kU+wu4h9ZWkqPYcTtTRXGgQJ1b7l1sDI3qOGvsaEQd5UpRbY2q8j9Dv3bJjcV3yW6LRoOGhzQFxYqNZZLcog+A5PQbqrmTy5DOCokQijTbHJ12k7F+nTiXx7WSoeRk8HDyjmNURpEe3/P4lxiVlCM5PttfO0d18kwnANIMXsJez32fDSVqoAjHJjn/G0DD+ilTQiZ+6laaqpenbKEIyHsnWsqdpsEFeooEwpQ== 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=RzBcakQ+prBoEdYktn4wVO4YWxK6P7h2scdG93Y6vUc=; b=drfzJXvpEKJjIB6f3OBwhTD8a52VTf9b3GjiI8TGcciaiYApRZBF2vd79sN7mjbX56msVB7nBpYnz5X1L0tifZj0HteN3chaZpk87O3gttQtqzI4PTYwsM9JzGeNPM8WA78Q2x3eLqXcqKwQxTi6fTdA8Hbik/HapdY4amCMDE/zqQuZaAevZo5w7KHfaQeNzU7KZhh9kzQ9FNjVyrLI015c6jQVRxTm7ShIb3BZHrWGPg0Ic8JQbvwYjtmyjxPxDvId7ZhD3bys6apiBsEGXCPXXWemHZGX9AboRE569rBF4aHiB5y6JiHagzjbc6zsFq9iilcoK/KXo78t30h2Dw== 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=RzBcakQ+prBoEdYktn4wVO4YWxK6P7h2scdG93Y6vUc=; b=s1oI35UdYoU/DJxv7McO+7nn3G9g3f340tZ6jlCn7sKbaE1lMXGWy9G2FtvWNNd0TBsJ6wbEcBXZhnVi4rmYtpjN7su6uLlihNl0/4lZLPFTC2aykmDr2QuRVHvfHADwO06kE/vNj+ye4tBve22r9oY+SMOyO2tTAT5Qyl979+/uUFCAFsNf/RU+KqJ+VLC9F62+2gSe6ziLD0uFlu4RJbBuUM+i7VkcV/QFGYhcMwf/07Ts1YgTNv85f7Hjey/dUpyQiCE8NOoo9mqHvyZSkRkfWmclmQQyQcGlOEsA+kb7zKIjqA5pH4qarU5ubyhvmKi3VxYj/JEpH6L1E9X3mA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0278.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:329::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.33; Mon, 24 Jul 2023 20:46:24 +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.6609.032; Mon, 24 Jul 2023 20:46:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jul 2023 22:47:25 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [i6aPeB35aJq2ceuSS7Wv6FA93gXydGfK] X-ClientProxiedBy: ZR2P278CA0053.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230724204725.2238214-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0278:EE_ X-MS-Office365-Filtering-Correlation-Id: 5a4d0c5f-8c75-4917-2410-08db8c870b07 X-MS-Exchange-SLBlob-MailProps: znQPCv1HvwXgXfJ2W+C50LduBvCyfAS75XrJ1j2BtKtehlwurOEVfYGrONYUl44m1VeMBwYg2ajC9lT6UMH8zVD35udxGpVBiuf2D+xpxLsYPVMAszqzWWg6FburnKBnHJ0/19dgtkMx/HUcQO3Y8PZX/eogbnAtXT35r2ng9mpqsYTVsx9NFdrYIXs+/9WwF2z41jHTFir0L1FwSfW9Svu6OEbITISUKdhBQ0mh7hcbJSTqpSZK+v5KrwNa2tPaBop6mzKBd8SoakEggPF3ALSxCkbjTZjaCNNShAOGrm4hdfbUmHjkbZDZRZic4Nx21w4+aPoOcCJp8pSPBU2nUltvF0f7xA5XnInFKD9XIP9sTLYT2Hq5NvEA8trdase4yCcWemEnL54o637msZ5wiUKoY1ZrJ3cYvxwU/6zoOsXi5uiZw64aNDv98VdBBbov7cr6n09FJFQGOKPA6DJ3Y2tabNjF0WqCqjL0dxzpRHUWKcAXBCFCg/r1t5NMdlyCvqpQMk69VE6kBLDMjlcft9G73o/EZp3PMmM6+rdCFYCD3Trdgj8m88voZrgLhq+8OhXK9x25nSL8yz/BxBZPd0vYzy1KePC3UHmXGUCJZZxo8r5k7PNeS4tsSTcWijo3eQNN9p6bytUhzSDljMLvrrGTS9Q3ejtyvzkrnvtn05YqokVLgg4QI3zEqMZ2X5Gi8LQ1XVFXkstHyoeXAFtyYhc46tKc4Ixd22caamUpRSKdalurDTkfw62id2iJ61zl3WE2g7unn3g= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ToUiiPnE64nOtDpll+DAOm/AlyzH8hawyNmhXxx7J3FLEGSPmidWl9j4o6Pqi/Bbdbr2RP8e6ycvmrOZ1Txm+RCQJg3xU0qcNQPk/Q/TIriByb0tw/I04onHieWMXJCUQifi52UH/GjmGSnWMiY5LZoVaHTWVBT8Coac3wV3NWTl+a/fRNlxxPgWZGLcj8FIoIxoiuVd5G1js9xYKm0w5GND/YLDlZfAlX49XDeZDg0AN5JMUWdxH/4Mc/RBabWA81S8g5rfQV2ogZbZpcOTVZNIgim3D2A+U0V9/N/sUZrPMmAnC5PAaHJfv00wL4e4HppKrEwmmDOtV6WrrQs5RQf3l9B67/L7PlOHY5tP3fCCgLkfaxdhV1IKUDFUuvY51xk5YyWZnBnVIRUQKK7CQBPuGaK4s8q53b03pNeh0kTEF5e1OhkLf13Ubm850D3IkIuVgsg7E++h3awXLo08q/t37DrftQEdLnfLwVVyR4mzJhnq3Ng4sBkciVn4LPTILfr8SScrDVk+r1eDMdhgS9DbVI0SRTX90m2xAjeQEuuBb/K7DtlZXRsSH5Nszi6hiAwGoRwMQPWGKJDggF37KmX95GZIiR7rPKaPtteelM2zO9WGibpzUPmt7G3fwd4A X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Fdtodg0YvCaU3cGOuyO874UvHOGXcxzmZKrJ1iNE9NHmF8yKyaJBiBfwJBfVvSoLh75jLPReKT1pif7p8aiVvekfdefJKZIbwa9opMNQugkpI1TbxuNuHkW6llXZDm5LVb7cqDriDasXBS5uihXLboWsyKChnPrEUVtUxOJTPy8NIIh5LMDEjCesmzdAYNhpDtJmabr9lGfPYWgZvYz09STYW+MkpEnqwiGTXjNri1gPU8QGg6ZHbsSZzBmtsRwwFvYw0RYzXlrnacol/++1lnAEJmZJlkGhUjPNEDTmOPOmm806dJrDmzCCkwnWtRiOg307YKU7B2B3Ai81ejzSUZuctFeeK+1m7SFt3RsRltt2EIeJ+59LqwQqg3rkXo5HTOu1RqbOAE76Gu5/p6857V4O1HVmCNMZ5he+6NTdhCRRUfO+5MyCIkQl7kY7LtnlbWqiuwJC693X+SHaXEMgdexO/IvoKJhbOiL4YzoXcZmZINACjSO0Yb3JnLJekZnx6kmuuJxxTf93AE5GjQknLHKqHVt6MSXNFasloM8gmCdg0Lf9uDzAWiH0sqsJ/qSTFu1rqjxdLQaPArpzdwyXKNF6mEwNFfOHK+Eq1kUDNcFIovTDSVUNNGmJIcyE7K7xNK1060pyghQ1tfNZPWlJpe7j/hQaU306z/xS8zyBLBeN4Sl0Fu4aNHHIRAzKYEhBJHOhDCZ94bhuZ46jWKmVn7JzlNuo4aNUgp/6NFIzoocC5CFYkbw4ku2B9Dt+RR2SjC2IPVI+lcYf4y3THhHLjg2Z5UXhl6FVV6xKYuny8iSvm1W/HdLgDUIXG9f2fphge0CzrKaHmAXa4x8ZUwxrNGiUpjcyHTuS9m6JerxCe9vg3mXPWDvLxh0YohfBPpP/UNXZsuiDxcgcHEcl38LK7BAA8JwBfJB06pRjA+1guN1p6IHoQPTrAp14lLyTr+HtSH7siSGM/0eP4lExnXKg7eOt9aaXYmlosUTdW6ecYZMEOwXIRwDNhdU8B1oD5LpQi6h5a+HZFo5beFnzsoRbOSKehFK1P9o2ZQi9VjHTQpidmnTG50EL7pKV+SU85RqOMDVj5m7RuBvDHs/ONtkGeoTUGu3C7n4ZW4M3kTmqupzb6chfmiFes9JO2ryqG8wxPfwrqvK7scjvKD91wKTn/t5pzLmZ2d5e6rgRYgaVTtzqAagb8vcSNmNUMgyTVtHzvZAqQzsFYtIOyYN+hE8tKFp/k0sBsomnSFqN1Mz06wyNv0hPs/qdUeSaIIeGB2gc X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5a4d0c5f-8c75-4917-2410-08db8c870b07 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2023 20:46:23.9004 (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: AM8P250MB0278 Subject: [FFmpeg-devel] [PATCH] avcodec/Makefile: Unconditionally skip vulkan_video_codec_av1std.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: YNISHS31y3EJ libavcodec/vulkan_video_codec_av1std.h currently does not pass checkheaders: It is missing stdint.h and vulkan/vulkan_core.h. The comment "This header is NOT YET generated from the Khronos Vulkan XML API Registry." as well as the fact that it does not use our standard inclusion guards makes the file appear as if it is to be treated like a third-party header and not one of our own. This commit therefore "fixes" the issue by unconditionally skipping said header. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9101ab73b4..625a40afb1 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1282,6 +1282,7 @@ SKIPHEADERS += %_tablegen.h \ aacenc_quantization.h \ aacenc_quantization_misc.h \ bitstream_template.h \ + vulkan_video_codec_av1std.h \ $(ARCH)/vpx_arith.h \ SKIPHEADERS-$(CONFIG_AMF) += amfenc.h @@ -1303,7 +1304,7 @@ SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_decode.h vaapi_hevc.h vaapi_encode.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h -SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std.h vulkan_video_codec_av1std_decode.h +SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode.h SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h v4l2_m2m.h SKIPHEADERS-$(CONFIG_ZLIB) += zlib_wrapper.h