From patchwork Fri Oct 4 09:31:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 52043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp295878vqg; Fri, 4 Oct 2024 03:09:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVHHFF3GBNSHcGBG/ylqZ8uFYOtk7Z/lzbyDlewmZiKmCe6rN1cvi266+F3EAEZ8Evuca2BA9wwNrnE5S5DpZWV@gmail.com X-Google-Smtp-Source: AGHT+IF5o5BCPvCny0Sp0PP8uQ213OHRni3/VgOs1rynfDfscmhFRYxN19Ly+11mEMcnfSx+6SzT X-Received: by 2002:a05:651c:2226:b0:2f7:6812:d0ae with SMTP id 38308e7fff4ca-2faf3c1cd82mr11512791fa.13.1728036544807; Fri, 04 Oct 2024 03:09:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728036544; cv=none; d=google.com; s=arc-20240605; b=E9kxYCG+gUw0PdUiMwB7qAqvLsPfWx5mpdmrS0xem8UGUksMIy4+xiRbSe5w169RWX IFuCO4KasTuoeqK+Ex0P/eCoc6/5PCetY6ZMFEAFjiLFtkYG8jJaIvkkp0hkoCa+Ieny cX9zTmoesyVSTPQZrc0bVhUo29FjSCVIPYvkKRgUsuPQ0T6VrYJ1Cz7gHZMZmO7dTHCk u6oNM4P3Y3yyCtDw9IQEpP12dKDt+yIB6wa1P4iN5OrZFdkJSKZVqk+SomuU/YxO+8nU HTRtzCfxmzIoapUMKnhHQomZ2wCT0KW45A86S6B4mNEfH1GfVGKhmgyyHGjoA/IG5gsf 34fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to :delivered-to; bh=xf0wDXJU+09X4oVLHkj/ojvd3IQOZuLtWb3py78stbU=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=PmaNb/3xAxgD9cezgob5DrcrSfrf56UrOHTOfJBs/mBglU2zUQSkvI41M5uLLqdPCH AmZQcPHxyv3IJVL5WQMhhjpjytSw3VZcl0Cluy35aj79JxP37Nr8SwNWTofjr5sDMBOi z+TogImgBvCaRIdSXxORk4ewlT5/67Do+1XQ09mTJrk4HmNNiAhI72jCwS29JrqGRixr x6KvDsCmBK3+z1bLmw1nb23MgqF2Yw5d3QO0AJ/1GF0D76h5fD3AlJZnIbAq/olLaUfW hijBrGXpfsVi1shmL+1/9LMTo1MsFlIfgj2Am+zlLNSUKleCAP38xHxjIuXZ9LBobb/j tYHA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2faecc6be84si10163231fa.425.2024.10.04.03.09.04; Fri, 04 Oct 2024 03:09:04 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B023B68DAF5; Fri, 4 Oct 2024 12:31:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFEE468DA0D for ; Fri, 4 Oct 2024 12:31:39 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Oct 2024 11:31:28 +0200 Message-ID: <20241004093137.139470-1-dev@lynne.ee> X-Mailer: git-send-email 2.45.2.753.g447d99e1c3b MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] lavfi/vulkan: remove redundant header 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: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PoV2E0k5I/qT --- libavfilter/Makefile | 2 +- libavfilter/vulkan.h | 24 ------------------------ libavfilter/vulkan_filter.h | 2 +- libavfilter/vulkan_spirv.h | 1 - 4 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 libavfilter/vulkan.h diff --git a/libavfilter/Makefile b/libavfilter/Makefile index a56c8e8b79..9253e362fc 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -662,7 +662,7 @@ SKIPHEADERS-$(CONFIG_LIBVIDSTAB) += vidstabutils.h SKIPHEADERS-$(CONFIG_QSVVPP) += qsvvpp.h stack_internal.h SKIPHEADERS-$(CONFIG_OPENCL) += opencl.h SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_vpp.h stack_internal.h -SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_filter.h +SKIPHEADERS-$(CONFIG_VULKAN) += vulkan_filter.h SKIPHEADERS-$(CONFIG_LIBSHADERC) += vulkan_spirv.h SKIPHEADERS-$(CONFIG_LIBGLSLANG) += vulkan_spirv.h diff --git a/libavfilter/vulkan.h b/libavfilter/vulkan.h deleted file mode 100644 index 928b2e21c3..0000000000 --- a/libavfilter/vulkan.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVFILTER_VULKAN_H -#define AVFILTER_VULKAN_H - -#include "libavutil/vulkan.h" - -#endif /* AVFILTER_VULKAN_H */ diff --git a/libavfilter/vulkan_filter.h b/libavfilter/vulkan_filter.h index 9f1297e0d2..6ed9c4de39 100644 --- a/libavfilter/vulkan_filter.h +++ b/libavfilter/vulkan_filter.h @@ -23,7 +23,7 @@ #include "avfilter.h" -#include "vulkan.h" +#include "libavutil/vulkan.h" /** * General lavfi IO functions diff --git a/libavfilter/vulkan_spirv.h b/libavfilter/vulkan_spirv.h index d008804ab2..b0349b6b54 100644 --- a/libavfilter/vulkan_spirv.h +++ b/libavfilter/vulkan_spirv.h @@ -21,7 +21,6 @@ #include "libavutil/vulkan.h" -#include "vulkan.h" #include "config.h" typedef struct FFVkSPIRVCompiler {