From 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:57:19 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' into 1.3nsq
---
QiaoJiaSystem/StructureApp/NewRecordVideoElement.h | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
index dc35006..2b578f5 100644
--- a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
+++ b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
@@ -35,7 +35,6 @@
#define RECORD_STOP (0)
#define RECORD_DOING (1)
#define RECORD_ENDING (2)
-
int recordStatus;
int videoLength;
int recordDelay;
@@ -53,7 +52,7 @@
std::queue<ImgInfo> m_imgBufQue;
HiredisTool m_hiredisTool;
std::string m_filename;
- bool isRecord;
+ bool m_bSaveWH;
};
#endif // RECORDVIDEOELEMENT_H
--
Gitblit v1.8.0