diff options
| author | Lynne <dev@lynne.ee> | 2024-10-04 11:16:53 +0200 |
|---|---|---|
| committer | Lynne <dev@lynne.ee> | 2024-10-06 01:21:41 +0200 |
| commit | 4c88186d5d8983d5a03a16409310b59e2b90eeaa (patch) | |
| tree | c8c66b1b053bc8a9483e8650221a97c78f0a17aa | |
| parent | 57d7ba4c4fe3d1956d9a14d8dd7f4acecf3fe1a1 (diff) | |
| download | ffmpeg-4c88186d5d8983d5a03a16409310b59e2b90eeaa.tar.gz | |
lavfi/vulkan: remove redundant header
| -rw-r--r-- | libavfilter/Makefile | 2 | ||||
| -rw-r--r-- | libavfilter/vulkan.h | 24 | ||||
| -rw-r--r-- | libavfilter/vulkan_filter.h | 2 | ||||
| -rw-r--r-- | libavfilter/vulkan_spirv.h | 1 |
4 files changed, 2 insertions, 27 deletions
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 { |