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

chenshijun

2019-04-03 91fbc7bca400b7ce958e306f09133e4cfc6db63b

 QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h

@@ -68,6 +68,7 @@

        std::atomic<bool> m_running;
        std::atomic<bool> m_waitSignal;
        std::atomic<bool> m_waitSignalrunning;

        //用来保存录像视频的路径
        std::string m_cutPath;