From 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 30 三月 2019 17:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq
---
QiaoJiaSystem/EncodeServer/EncodeVideoManager.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/EncodeServer/EncodeVideoManager.cpp b/QiaoJiaSystem/EncodeServer/EncodeVideoManager.cpp
index 27523af..77f36a0 100644
--- a/QiaoJiaSystem/EncodeServer/EncodeVideoManager.cpp
+++ b/QiaoJiaSystem/EncodeServer/EncodeVideoManager.cpp
@@ -39,7 +39,7 @@
void EncodeVideoManager::timerFunc()
{
// std::string tmp="camId="+m_camId+"videoCaptureElement";
- ClockTimer cl("timerFunc");
+ //ClockTimer cl("timerFunc");
std::map<std::string,int> fileMap=m_hiredisTool.findAllFileStatus();
// auto it=fileMap.begin();
for(auto it=fileMap.begin();it!=fileMap.end();it++)
--
Gitblit v1.8.0