fixed to use NVCUVID in 'cudacodec' module.

2016-01-31 01:56:45 +09:00
parent e835878661
commit 69eaa89e22
4 changed files with 22 additions and 6 deletions
--- a/modules/gpu/src/precomp.hpp
+++ b/modules/gpu/src/precomp.hpp
@@ -98,7 +98,9 @@
        #include <nvcuvid.h>

        #ifdef WIN32
-            #include <NVEncoderAPI.h>
+            #ifdef HAVE_NVCUVENC
+                #include <NVEncoderAPI.h>
+            #endif
        #endif
    #endif

--- a/modules/gpu/src/video_writer.cpp
+++ b/modules/gpu/src/video_writer.cpp
@@ -42,7 +42,7 @@

 #include "precomp.hpp"

-#if !defined(HAVE_CUDA) || defined(CUDA_DISABLER) || !defined(HAVE_NVCUVID) || !defined(WIN32)
+#if !defined(HAVE_CUDA) || defined(CUDA_DISABLER) || !defined(HAVE_NVCUVENC) || !defined(WIN32)

 class cv::gpu::VideoWriter_GPU::Impl
 {