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

chenshijun

2019-04-03 91fbc7bca400b7ce958e306f09133e4cfc6db63b

 QiaoJiaSystem/VideoToImageMulth/RtspImageRedis.h

@@ -47,7 +47,7 @@
    std::string m_camId;

    //每台摄像机保存到Redis的图片数量的最大值
    const int M_CAM_PIC_MAX_COUNT = 25;
    const int M_CAM_PIC_MAX_COUNT = 3;
};

#endif // VIDEOCAPTUREELEMENT_H