mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-25 22:57:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9599 from whizzzkid:master

Browse Source 
Incorrect Naming (#9599)

* Resolved #9544

* This is a better fix

* This should be good.
This commit is contained in:
Nishant Arora 2017-09-17 13:24:43 -06:00 committed by Alexander Alekhin
parent 4196543cd5
commit 37ba1d6f2d
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/cudacodec/src/cuvid_video_source.hpp
View File

@ -44,8 +44,11 @@
#ifndef __CUVID_VIDEO_SOURCE_HPP__ #ifndef __CUVID_VIDEO_SOURCE_HPP__
#define __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/core/private.cuda.hpp"
#include "opencv2/cudacodec.hpp" #include "opencv2/cudacodec.hpp"
#include "video_source.hpp" #include "video_source.hpp"

6
modules/cudacodec/src/frame_queue.hpp
View File

@ -47,7 +47,11 @@
#include "opencv2/core/utility.hpp" #include "opencv2/core/utility.hpp"
#include "opencv2/core/private.cuda.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 namespace cv { namespace cudacodec { namespace detail
{ {

6
modules/cudacodec/src/precomp.hpp
View File

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

6
modules/cudacodec/src/video_decoder.hpp
View File

@ -44,7 +44,11 @@
#ifndef __VIDEO_DECODER_HPP__ #ifndef __VIDEO_DECODER_HPP__
#define __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/core/private.cuda.hpp"
#include "opencv2/cudacodec.hpp" #include "opencv2/cudacodec.hpp"

6
modules/cudacodec/src/video_parser.hpp
View File

@ -44,7 +44,11 @@
#ifndef __VIDEO_PARSER_HPP__ #ifndef __VIDEO_PARSER_HPP__
#define __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/core/private.cuda.hpp"
#include "opencv2/cudacodec.hpp" #include "opencv2/cudacodec.hpp"