From e634f49a3b619017a3d040d1bdf68aebad07ae4f Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 05 三月 2019 09:26:54 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2
---
QiaoJiaSystem/StructureApp/AppPipeController.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.h b/QiaoJiaSystem/StructureApp/AppPipeController.h
index e46de35..2018f12 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.h
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.h
@@ -109,8 +109,8 @@
FaceRpcElement faceRpcElement;
FaceExtractElement faceExtractElement;
ImageDrawElement imageDrawElement;
- RecordVideoElement recordVideoElement;
- NewRecordVideoElement newRecordVideoElement;
+// RecordVideoElement recordVideoElement;
+// NewRecordVideoElement newRecordVideoElement;
PersonElement personElement;
int m_index;
--
Gitblit v1.8.0