ASCEE/lasp
ASCEE/lasp
5
1
Fork 0
Code Issues 5 Pull Requests Actions Releases 14 Activity

Merge branch 'develop' of ssh://code.ascee.nl:12001/ASCEE/lasp into develop

Browse Source
This commit is contained in:
Anne de Jong 2020-07-09 09:45:14 +02:00
commit 6830d5192e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -71,7 +71,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
link_directories(C:\\mingw\\lib)
link_directories(C:\\mingw\\bin)
link_directories(..\\rtaudio)
link_directories(C:\\Users\\librewin7\\Miniconda3)
link_directories(C:\\Users\\User\\Miniconda3)
else()
set(win32 false)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -std=c11 \

2
lasp/lasp_avstream.py
View File

@ -3,7 +3,7 @@
"""
Description: Read data from image stream and record sound at the same time
"""
import cv2 as cv
#import cv2 as cv
from .lasp_atomic import Atomic
from threading import Thread, Condition, Lock
import numpy as np