potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

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

Browse Source 
OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
This commit is contained in:
Alexander Alekhin
2018-06-13 19:20:12 +03:00
parent d1a598c652 54e8487f56
commit 0d6518aaa0
177 changed files with 5608 additions and 2469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/system.cpp
-1
View File
@@ -736,7 +736,6 @@ int64 getCPUTickCount(void)
int64 getCPUTickCount(void)
{
int64 result = 0;
unsigned upper, lower, tmp;
__asm__ volatile(
"0: \n"