Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq

chenshijun

2019-03-30 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d

 QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h

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

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