[FFmpeg-cvslog] lavc/vulkan: remove redundant header

[Lynne]

ffmpeg | branch: master | Lynne <dev at lynne.ee> | Fri Oct  4 11:17:47 2024 +0200| [fcd1cdcb7b749abc97d3f2252d843ca1730a6e24] | committer: Lynne

lavc/vulkan: remove redundant header

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fcd1cdcb7b749abc97d3f2252d843ca1730a6e24
---

 libavcodec/Makefile       |  2 +-
 libavcodec/vulkan.h       | 24 ------------------------
 libavcodec/vulkan_video.h |  2 +-
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 4eed81ed03..ec4f3861f3 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1291,7 +1291,7 @@ SKIPHEADERS-$(CONFIG_QSVENC)           += qsvenc.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_encode.h vulkan_decode.h
+SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan_video.h vulkan_encode.h vulkan_decode.h
 SKIPHEADERS-$(CONFIG_V4L2_M2M)         += v4l2_buffers.h v4l2_context.h v4l2_m2m.h
 SKIPHEADERS-$(CONFIG_ZLIB)             += zlib_wrapper.h
 
diff --git a/libavcodec/vulkan.h b/libavcodec/vulkan.h
deleted file mode 100644
index b15efd4add..0000000000
--- a/libavcodec/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 AVCODEC_VULKAN_H
-#define AVCODEC_VULKAN_H
-
-#include "libavutil/vulkan.h"
-
-#endif /* AVCODEC_VULKAN_H */
diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h
index c205f7b88f..1ec5f419ed 100644
--- a/libavcodec/vulkan_video.h
+++ b/libavcodec/vulkan_video.h
@@ -20,7 +20,7 @@
 #define AVCODEC_VULKAN_VIDEO_H
 
 #include "avcodec.h"
-#include "vulkan.h"
+#include "libavutil/vulkan.h"
 
 #include <vk_video/vulkan_video_codecs_common.h>