potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03: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
2021-12-03 12:32:49 +00:00
parent c3910807c5 35ff9af6ce
commit 8b4fa2605e
89 changed files with 1116 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/src/precomp.hpp
-1
View File
@@ -82,7 +82,6 @@
#include <string.h>
#include <limits.h>
#include <ctype.h>
#include <assert.h> // FIXIT remove this
#if defined _WIN32 || defined WINCE
#if !defined _WIN32_WINNT