Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pansen

2019-03-06 6f27f088e5d9e828bdce65ab85984d2084bab222

 QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.h

@@ -44,7 +44,7 @@

private:
    LDBTool *m_lDBTool;

    int m_GB28181_Enable;
    std::map<std::string, AppPipeController *> controllers;
    std::atomic<int> currentCount;
    int maxCount;