MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avutil/cuda_check: Fix non-dynamic-loader implementation

Browse Source 
The function typedefs we were using are only present when using the
dynamic loader, which means compilation breaks for code directly
using the cuda SDK.

To fix this, let's just duplicate the function typedefs locally.
These are not going to change.
This commit is contained in:
Philip Langdale 2019-02-19 19:12:19 -08:00
parent fc32e08941
commit 96d79ff5b5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavutil/cuda_check.h
View File

@ -20,6 +20,9 @@
#ifndef AVUTIL_CUDA_CHECK_H
#define AVUTIL_CUDA_CHECK_H
typedef CUresult CUDAAPI cuda_check_GetErrorName(CUresult error, const char** pstr);
typedef CUresult CUDAAPI cuda_check_GetErrorString(CUresult error, const char** pstr);
/**
* Wrap a CUDA function call and print error information if it fails.
*/
@ -35,8 +38,8 @@ static inline int ff_cuda_check(void *avctx,
if (err == CUDA_SUCCESS)
return 0;
((tcuGetErrorName *)cuGetErrorName_fn)(err, &err_name);
((tcuGetErrorString *)cuGetErrorString_fn)(err, &err_string);
((cuda_check_GetErrorName *)cuGetErrorName_fn)(err, &err_name);
((cuda_check_GetErrorString *)cuGetErrorString_fn)(err, &err_string);
av_log(avctx, AV_LOG_ERROR, "%s failed", func);
if (err_name && err_string)