virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

hwcontext_vulkan: fix CreateSemaphore conflict with synchapi.h

Browse Source 
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.
This commit is contained in:
Lynne
2021-11-12 14:36:20 +01:00
parent 57e11321ea
commit 296cb99d46
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavutil/hwcontext_vulkan.c
View File

@@ -19,6 +19,13 @@
#define VK_NO_PROTOTYPES #define VK_NO_PROTOTYPES
#define VK_ENABLE_BETA_EXTENSIONS #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 <unistd.h>
#include "config.h" #include "config.h"
@@ -32,12 +39,6 @@
#include "vulkan_loader.h" #include "vulkan_loader.h"
#ifdef _WIN32
#include "compat/w32dlfcn.h"
#else
#include <dlfcn.h>
#endif
#if CONFIG_LIBDRM #if CONFIG_LIBDRM
#include <xf86drm.h> #include <xf86drm.h>
#include <drm_fourcc.h> #include <drm_fourcc.h>