Merge pull request #17527 from tomoaki0705:detectCuvidHeader

modules/cudacodec/src/cuvid_video_source.hpp

@@ -44,9 +44,9 @@
 #ifndef __CUVID_VIDEO_SOURCE_HPP__
 #define __CUVID_VIDEO_SOURCE_HPP__
 
-#if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
+#if defined(HAVE_DYNLINK_NVCUVID_HEADER)
     #include <dynlink_nvcuvid.h>
-#else
+#elif defined(HAVE_NVCUVID_HEADER)
     #include <nvcuvid.h>
 #endif
 #include "opencv2/core/private.cuda.hpp"

modules/cudacodec/src/frame_queue.hpp

@@ -47,9 +47,9 @@
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/private.cuda.hpp"
 
-#if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
+#if defined(HAVE_DYNLINK_NVCUVID_HEADER)
     #include <dynlink_nvcuvid.h>
-#else
+#elif defined(HAVE_NVCUVID_HEADER)
     #include <nvcuvid.h>
 #endif
 

modules/cudacodec/src/precomp.hpp

@@ -56,9 +56,9 @@
 #include "opencv2/core/private.cuda.hpp"
 
 #ifdef HAVE_NVCUVID
-    #if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
+    #if defined(HAVE_DYNLINK_NVCUVID_HEADER)
         #include <dynlink_nvcuvid.h>
-    #else
+    #elif defined(HAVE_NVCUVID_HEADER)
         #include <nvcuvid.h>
     #endif
 

modules/cudacodec/src/video_decoder.hpp

@@ -44,9 +44,9 @@
 #ifndef __VIDEO_DECODER_HPP__
 #define __VIDEO_DECODER_HPP__
 
-#if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
+#if defined(HAVE_DYNLINK_NVCUVID_HEADER)
     #include <dynlink_nvcuvid.h>
-#else
+#elif defined(HAVE_NVCUVID_HEADER)
     #include <nvcuvid.h>
 #endif
 

modules/cudacodec/src/video_parser.hpp

@@ -44,9 +44,9 @@
 #ifndef __VIDEO_PARSER_HPP__
 #define __VIDEO_PARSER_HPP__
 
-#if CUDA_VERSION >= 9000 && CUDA_VERSION < 10000
+#if defined(HAVE_DYNLINK_NVCUVID_HEADER)
     #include <dynlink_nvcuvid.h>
-#else
+#elif defined(HAVE_NVCUVID_HEADER)
     #include <nvcuvid.h>
 #endif