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

pansen

2019-03-15 c64a4f19a0a41b62917eb1dc8b0789c9ddf6baab

 QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h

@@ -40,6 +40,7 @@
        std::string MakeDir(const std::string &timeStamp);

    private:
        int reopenTime{1000};
        int m_gpuIdx;
        int m_fps;
        int m_streamTransType;