ffmpeg | branch: master | Philip Langdale <phil...@overt.org> | Tue Feb 19 19:12:19 2019 -0800| [96d79ff5b5c8b08eaead6fd2c77a265fd2c40b22] | committer: 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. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=96d79ff5b5c8b08eaead6fd2c77a265fd2c40b22 --- libavutil/cuda_check.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavutil/cuda_check.h b/libavutil/cuda_check.h index ec1705b000..d02ea7eec4 100644 --- a/libavutil/cuda_check.h +++ b/libavutil/cuda_check.h @@ -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) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
