Commit 96d79ff5 authored by Philip Langdale's avatar Philip Langdale

avutil/cuda_check: Fix non-dynamic-loader implementation

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.
parent fc32e089
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
#ifndef AVUTIL_CUDA_CHECK_H #ifndef AVUTIL_CUDA_CHECK_H
#define 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. * Wrap a CUDA function call and print error information if it fails.
*/ */
...@@ -35,8 +38,8 @@ static inline int ff_cuda_check(void *avctx, ...@@ -35,8 +38,8 @@ static inline int ff_cuda_check(void *avctx,
if (err == CUDA_SUCCESS) if (err == CUDA_SUCCESS)
return 0; return 0;
((tcuGetErrorName *)cuGetErrorName_fn)(err, &err_name); ((cuda_check_GetErrorName *)cuGetErrorName_fn)(err, &err_name);
((tcuGetErrorString *)cuGetErrorString_fn)(err, &err_string); ((cuda_check_GetErrorString *)cuGetErrorString_fn)(err, &err_string);
av_log(avctx, AV_LOG_ERROR, "%s failed", func); av_log(avctx, AV_LOG_ERROR, "%s failed", func);
if (err_name && err_string) if (err_name && err_string)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment