| Message ID | AS8P250MB0744636F6E1B70D50EB6644A8F5C2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | e429b0fdb7a956f77bb5cd7284101e0e8e6b4d43 |
| Headers | show |
| Series | [FFmpeg-devel,1/8] avutil/vulkan: Don't autoinclude vulkan_loader.h | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c index 5def908a21..2448ee99ec 100644 --- a/libavcodec/vulkan_decode.c +++ b/libavcodec/vulkan_decode.c @@ -21,6 +21,7 @@ #include "vulkan_decode.h" #include "config_components.h" #include "libavutil/avassert.h" +#include "libavutil/vulkan_loader.h" #if CONFIG_H264_VULKAN_HWACCEL extern const VkExtensionProperties ff_vk_dec_h264_ext; diff --git a/libavfilter/vulkan_filter.c b/libavfilter/vulkan_filter.c index c77415d1be..d3dc2fdacb 100644 --- a/libavfilter/vulkan_filter.c +++ b/libavfilter/vulkan_filter.c @@ -19,6 +19,7 @@ */ #include "vulkan_filter.h" +#include "libavutil/vulkan_loader.h" int ff_vk_filter_init_context(AVFilterContext *avctx, FFVulkanContext *s, AVBufferRef *frames_ref, diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index bf8456b06d..76b61dcaaa 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -21,7 +21,6 @@ #include "avassert.h" #include "vulkan.h" -#include "vulkan_loader.h" const VkComponentMapping ff_comp_identity_map = { .r = VK_COMPONENT_SWIZZLE_IDENTITY, diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h index a5e78760d7..184d58ff5c 100644 --- a/libavutil/vulkan.h +++ b/libavutil/vulkan.h @@ -29,7 +29,6 @@ #include "hwcontext.h" #include "vulkan_functions.h" #include "hwcontext_vulkan.h" -#include "vulkan_loader.h" /* GLSL management macros */ #define INDENT(N) INDENT_##N
Only include it where necessary. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/vulkan_decode.c | 1 + libavfilter/vulkan_filter.c | 1 + libavutil/vulkan.c | 1 - libavutil/vulkan.h | 1 - 4 files changed, 2 insertions(+), 2 deletions(-)