xinyang 1abe8dec17 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	main.cpp

2019-07-06 20:22:06 +08:00

..

camera_wrapper.cpp

Merge remote-tracking branch 'origin/master'

2019-07-06 20:22:06 +08:00

video_wrapper.cpp

修改了摄像头读取方式

2019-04-27 16:16:53 +08:00