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

chenshijun

2019-03-30 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d

 QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h

@@ -21,7 +21,8 @@
//#include <VideoToImageMulth/rpc/RtspAnalysServer.h>

//using BASICGB28181::VideoCaptureElementWithRtp;

//外部使用的全局指针
extern void *gRtspAnalysManagerCamera;
//用来实现recordVideo的RPC的接口类
class RtspAnalysManager : public ::RtspAnalys::RtspAnalysServer {