Merge pull request #1946 from LinkeyLeo:master

alalek · alalek · commit 25221244732d · 2018-12-18T12:01:13.000Z
diff --git a/modules/cudacodec/src/cuvid_video_source.hpp b/modules/cudacodec/src/cuvid_video_source.hpp
@@ -44,7 +44,7 @@
 #ifndef __CUVID_VIDEO_SOURCE_HPP__
 #define __CUVID_VIDEO_SOURCE_HPP__
 
-#if CUDA_VERSION >= 9000
+#if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
     #include <dynlink_nvcuvid.h>
 #else
     #include <nvcuvid.h>
diff --git a/modules/cudacodec/src/frame_queue.hpp b/modules/cudacodec/src/frame_queue.hpp
@@ -47,7 +47,7 @@
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/private.cuda.hpp"
 
-#if CUDA_VERSION >= 9000
+#if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
     #include <dynlink_nvcuvid.h>
 #else
     #include <nvcuvid.h>
diff --git a/modules/cudacodec/src/precomp.hpp b/modules/cudacodec/src/precomp.hpp
@@ -56,7 +56,7 @@
 #include "opencv2/core/private.cuda.hpp"
 
 #ifdef HAVE_NVCUVID
-    #if CUDA_VERSION >= 9000
+    #if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
         #include <dynlink_nvcuvid.h>
     #else
         #include <nvcuvid.h>
diff --git a/modules/cudacodec/src/video_decoder.hpp b/modules/cudacodec/src/video_decoder.hpp
@@ -44,7 +44,7 @@
 #ifndef __VIDEO_DECODER_HPP__
 #define __VIDEO_DECODER_HPP__
 
-#if CUDA_VERSION >= 9000
+#if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
     #include <dynlink_nvcuvid.h>
 #else
     #include <nvcuvid.h>
diff --git a/modules/cudacodec/src/video_parser.hpp b/modules/cudacodec/src/video_parser.hpp
@@ -44,7 +44,7 @@
 #ifndef __VIDEO_PARSER_HPP__
 #define __VIDEO_PARSER_HPP__
 
-#if CUDA_VERSION >= 9000
+#if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
     #include <dynlink_nvcuvid.h>
 #else
     #include <nvcuvid.h>
