Skip to content

Commit 1362514

Browse files
committed
Add #ifdef guard for CUuuid_st
With the CUDA 10 SDK, this type can get redefined when including full cuda headers. Strangely, nvidia seem to have expected this and have an #ifdef convention in place already. We need to respect that.
1 parent ebeec4d commit 1362514

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

ffnvcodec.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ includedir=${prefix}/include
33

44
Name: ffnvcodec
55
Description: FFmpeg version of Nvidia Codec SDK headers
6-
Version: 8.2.15.3
6+
Version: 8.2.15.4
77
Cflags: -I${includedir}

include/ffnvcodec/dynlink_cuda.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,12 @@ typedef enum CUexternalSemaphoreHandleType_enum {
108108
CU_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE = 4
109109
} CUexternalSemaphoreHandleType;
110110

111+
#ifndef CU_UUID_HAS_BEEN_DEFINED
112+
#define CU_UUID_HAS_BEEN_DEFINED
111113
typedef struct CUuuid_st {
112114
char bytes[16];
113115
} CUuuid;
116+
#endif
114117

115118
typedef struct CUDA_MEMCPY2D_st {
116119
size_t srcXInBytes;

0 commit comments

Comments
 (0)