Merge branch 'yangwu1.3' of ssh://192.168.1.226:29418/development/c++ into ...

chenshijun

2019-04-03 91fbc7bca400b7ce958e306f09133e4cfc6db63b

 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;