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

pans

2019-03-14 07fb2c16c75734d8c127585353249f529ea1262c

 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;