diff options
| author | Lynne <dev@lynne.ee> | 2021-11-12 14:36:20 +0100 |
|---|---|---|
| committer | Lynne <dev@lynne.ee> | 2021-11-12 14:45:20 +0100 |
| commit | 296cb99d46b5f72d393ec06bef2753098d19fad2 (patch) | |
| tree | d6ba2be95add488ce52b84166e8110dd1c9b65ca | |
| parent | 57e11321ea378a57a909d817c2fcf2ebcaf8c123 (diff) | |
| download | ffmpeg-296cb99d46b5f72d393ec06bef2753098d19fad2.tar.gz | |
hwcontext_vulkan: fix CreateSemaphore conflict with synchapi.h
Include windows.h to fix it. Normally, it'd be better to include it in
vulkan_functions.h, but I'm reasonably confident nothing else that uses
the Vulkan code will need to include Windows functions and not windows.h.
| -rw-r--r-- | libavutil/hwcontext_vulkan.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 6e746d4aa4..3c86e2d683 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -19,6 +19,13 @@ #define VK_NO_PROTOTYPES #define VK_ENABLE_BETA_EXTENSIONS +#ifdef _WIN32 +#include <windows.h> /* Included to prevent conflicts with CreateSemaphore */ +#include "compat/w32dlfcn.h" +#else +#include <dlfcn.h> +#endif + #include <unistd.h> #include "config.h" @@ -32,12 +39,6 @@ #include "vulkan_loader.h" -#ifdef _WIN32 -#include "compat/w32dlfcn.h" -#else -#include <dlfcn.h> -#endif - #if CONFIG_LIBDRM #include <xf86drm.h> #include <drm_fourcc.h> |