Guard against multiple definitions of CUuuid

diff --git a/ffnvcodec.pc.in b/ffnvcodec.pc.in
index 800587bc6657cf6e70ff8d51edf0b6551964434b..ec6546fd42bbee7698c2f61d106b2996294c8775 100644 (file)
--- a/ffnvcodec.pc.in
+++ b/ffnvcodec.pc.in
@@ -3,5 +3,5 @@ includedir=${prefix}/include
 
 Name: ffnvcodec
 Description: FFmpeg version of Nvidia Codec SDK headers
-Version: 8.2.15.3
+Version: 8.2.15.4
 Cflags: -I${includedir}

diff --git a/include/ffnvcodec/dynlink_cuda.h b/include/ffnvcodec/dynlink_cuda.h
index e2e0a6d94a9b75f5e3e325418e023ddb6a6c3e55..373215db8ee812d8f81ef0c690229e3f02305d2b 100644 (file)
--- a/include/ffnvcodec/dynlink_cuda.h
+++ b/include/ffnvcodec/dynlink_cuda.h
@@ -100,9 +100,12 @@ typedef enum CUexternalMemoryHandleType_enum {
     CU_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE   = 5,
 } CUexternalMemoryHandleType;
 
+#ifndef CU_UUID_HAS_BEEN_DEFINED
+#define CU_UUID_HAS_BEEN_DEFINED
 typedef struct CUuuid_st {
     char bytes[16];
 } CUuuid;
+#endif
 
 typedef struct CUDA_MEMCPY2D_st {
     size_t srcXInBytes;