potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2020-06-19 07:33:50 +00:00
parent 9ba5581d17 cb54f4c2ec
commit e3d502310f
11 changed files with 186 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/templates/cvconfig.h.in
+2
View File
@@ -95,6 +95,8 @@
/* NVIDIA Video Decoding API*/
#cmakedefine HAVE_NVCUVID
#cmakedefine HAVE_NVCUVID_HEADER
#cmakedefine HAVE_DYNLINK_NVCUVID_HEADER
/* NVIDIA Video Encoding API*/
#cmakedefine HAVE_NVCUVENC