Commit 25221244 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files

Merge pull request #1946 from LinkeyLeo:master

parents fd34389a fe7301ea

modules/cudacodec/src/cuvid_video_source.hpp

+1 −1
Original line number Diff line number Diff line
@@ -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>

modules/cudacodec/src/frame_queue.hpp

+1 −1
Original line number Diff line number Diff line
@@ -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>

modules/cudacodec/src/precomp.hpp

+1 −1
Original line number Diff line number Diff line
@@ -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>

modules/cudacodec/src/video_decoder.hpp

+1 −1
Original line number Diff line number Diff line
@@ -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>

modules/cudacodec/src/video_parser.hpp

+1 −1
Original line number Diff line number Diff line
@@ -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>