From d6ae9fa43cb42b76537085419be2a29ccdadc6d1 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期二, 19 二月 2019 17:03:01 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
QiaoJiaSystem/DataManagerServer/AppPipeController.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
index a8cf2f7..8d00d0e 100644
--- a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
+++ b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
@@ -15,7 +15,7 @@
}
videoCaptureElement.registerConnector([&]{
//if(!videoPublishElement.isBusy()){
- //videoPublishElement.setImage(videoCaptureElement.getImage());
+ videoPublishElement.setImage(videoCaptureElement.getImage());
//videoPublishElement.submit();
//}
--
Gitblit v1.8.0