nvdec/nvenc: Add CUDA Toolkit 10.1 support

Update to support the latest CUDA Toolkit version 10.1
This commit is contained in:
Seungha Yang 2019-03-07 21:21:18 +09:00
parent 10e6f6b6cb
commit ebe01995ff
2 changed files with 11 additions and 9 deletions

View file

@ -938,15 +938,16 @@ AG_GST_CHECK_FEATURE(CUDA, [NVIDIA CUDA API],, [
CUDA_LIBS="-L$CUDA_PREFIX/lib -L$CUDA_PREFIX/lib64 -L$CUDA_PREFIX/lib/stubs -L$CUDA_PREFIX/lib64/stubs -lcuda -lcudart" CUDA_LIBS="-L$CUDA_PREFIX/lib -L$CUDA_PREFIX/lib64 -L$CUDA_PREFIX/lib/stubs -L$CUDA_PREFIX/lib64/stubs -lcuda -lcudart"
fi fi
else else
PKG_CHECK_MODULES([CUDA], [cuda-10.0 cudart-10.0],, [ PKG_CHECK_MODULES([CUDA], [cuda-10.1 cudart-10.1],, [
PKG_CHECK_MODULES([CUDA], [cuda-9.2 cudart-9.2],, [ PKG_CHECK_MODULES([CUDA], [cuda-10.0 cudart-10.0],, [
PKG_CHECK_MODULES([CUDA], [cuda-9.1 cudart-9.1],, [ PKG_CHECK_MODULES([CUDA], [cuda-9.2 cudart-9.2],, [
PKG_CHECK_MODULES([CUDA], [cuda-9.0 cudart-9.0],, [ PKG_CHECK_MODULES([CUDA], [cuda-9.1 cudart-9.1],, [
PKG_CHECK_MODULES([CUDA], [cuda-8.0 cudart-8.0],, [ PKG_CHECK_MODULES([CUDA], [cuda-9.0 cudart-9.0],, [
PKG_CHECK_MODULES([CUDA], [cuda-7.5 cudart-7.5],, [ PKG_CHECK_MODULES([CUDA], [cuda-8.0 cudart-8.0],, [
PKG_CHECK_MODULES([CUDA], [cuda-7.0 cudart-7.0],, [ PKG_CHECK_MODULES([CUDA], [cuda-7.5 cudart-7.5],, [
PKG_CHECK_MODULES([CUDA], [cuda-6.5 cudart-6.5],, [ PKG_CHECK_MODULES([CUDA], [cuda-7.0 cudart-7.0],, [
AC_MSG_WARN([Could not find cuda headers/libraries])])])])])])])])]) PKG_CHECK_MODULES([CUDA], [cuda-6.5 cudart-6.5],, [
AC_MSG_WARN([Could not find cuda headers/libraries])])])])])])])])])])
fi fi
HAVE_CUDA_H=no HAVE_CUDA_H=no

View file

@ -60,6 +60,7 @@ if host_machine.system() == 'windows'
endif endif
else else
cuda_versions = [ cuda_versions = [
'10.1',
'10.0', '10.0',
'9.2', '9.2',
'9.1', '9.1',