From 80aaed73e66ae52465d2630d9239b9423f1cc86d Mon Sep 17 00:00:00 2001
From: baka-gori <devel.gori@gmail.com>
Date: Sun, 9 Feb 2020 22:18:29 +0900
Subject: [PATCH] add cuda 10 support

---
 modules/cudacodec/src/cuvid_video_source.hpp | 2 +-
 modules/cudacodec/src/frame_queue.hpp        | 2 +-
 modules/cudacodec/src/precomp.hpp            | 2 +-
 modules/cudacodec/src/video_decoder.hpp      | 2 +-
 modules/cudacodec/src/video_parser.hpp       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/cudacodec/src/cuvid_video_source.hpp b/modules/cudacodec/src/cuvid_video_source.hpp
index 3d7524a855..802e65a92c 100644
--- 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
index 88add3abaf..3ff06a67ed 100644
--- 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
index 3c53a9b940..728924fa61 100644
--- 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
index 3fce5194c5..30878caa7b 100644
--- 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
index 165b4206fe..5bd0f96562 100644
--- 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>