Merge pull request #9599 from whizzzkid:master

Incorrect Naming (#9599)

* Resolved #9544

* This is a better fix

* This should be good.

modules/cudacodec/src/cuvid_video_source.hpp

@@ -44,8 +44,11 @@
 #ifndef __CUVID_VIDEO_SOURCE_HPP__
 #define __CUVID_VIDEO_SOURCE_HPP__
 
-#include <nvcuvid.h>
-
+#if CUDA_VERSION >= 9000
+    #include <dynlink_nvcuvid.h>
+#else
+    #include <nvcuvid.h>
+#endif
 #include "opencv2/core/private.cuda.hpp"
 #include "opencv2/cudacodec.hpp"
 #include "video_source.hpp"

modules/cudacodec/src/frame_queue.hpp

@@ -47,7 +47,11 @@
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/private.cuda.hpp"
 
-#include <nvcuvid.h>
+#if CUDA_VERSION >= 9000
+    #include <dynlink_nvcuvid.h>
+#else
+    #include <nvcuvid.h>
+#endif
 
 namespace cv { namespace cudacodec { namespace detail
 {

modules/cudacodec/src/precomp.hpp

@@ -56,7 +56,11 @@
 #include "opencv2/core/private.cuda.hpp"
 
 #ifdef HAVE_NVCUVID
+    #if CUDA_VERSION >= 9000
         #include <dynlink_nvcuvid.h>
+    #else
+        #include <nvcuvid.h>
+    #endif
 
     #ifdef _WIN32
         #define NOMINMAX

modules/cudacodec/src/video_decoder.hpp

@@ -44,7 +44,11 @@
 #ifndef __VIDEO_DECODER_HPP__
 #define __VIDEO_DECODER_HPP__
 
-#include <nvcuvid.h>
+#if CUDA_VERSION >= 9000
+    #include <dynlink_nvcuvid.h>
+#else
+    #include <nvcuvid.h>
+#endif
 
 #include "opencv2/core/private.cuda.hpp"
 #include "opencv2/cudacodec.hpp"

modules/cudacodec/src/video_parser.hpp

@@ -44,7 +44,11 @@
 #ifndef __VIDEO_PARSER_HPP__
 #define __VIDEO_PARSER_HPP__
 
-#include <nvcuvid.h>
+#if CUDA_VERSION >= 9000
+    #include <dynlink_nvcuvid.h>
+#else
+    #include <nvcuvid.h>
+#endif
 
 #include "opencv2/core/private.cuda.hpp"
 #include "opencv2/cudacodec.hpp"