From a2ea58c567a078bb97a9e45a56fe50df41438d22 Mon Sep 17 00:00:00 2001 From: chenshijun <csj_sky@126.com> Date: 星期一, 15 四月 2019 10:37:31 +0800 Subject: [PATCH] 整合c++ver1.3的修改代码进入该分支 --- QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h index 0ca39eb..8e0a92c 100644 --- a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h +++ b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h @@ -73,12 +73,12 @@ std::atomic<bool> m_running; std::atomic<bool> m_waitSignal; - std::atomic<bool> m_waitSignalrunning; + std::atomic<bool> m_waitSignalrunning{false}; //鐢ㄦ潵淇濆瓨褰曞儚瑙嗛鐨勮矾寰� std::string m_cutPath; std::atomic<bool> m_publishVideoRet{false}; - ffmpeg::VideoPublishElement * videoPublishElement; + ffmpeg::VideoPublishElement * videoPublishElement{nullptr}; private: /*** * 鍚姩瀹炴椂娴佹帴鏀舵暟鎹嚎绋� -- Gitblit v1.8.0