From ad8ee0872802ba5d0194458bf215a6cc89f4d0d0 Mon Sep 17 00:00:00 2001 From: chenshijun <csj_sky@126.com> Date: 星期一, 15 四月 2019 15:30:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq --- QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h index 0ca39eb..1eaf254 100644 --- a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h +++ b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.h @@ -73,7 +73,7 @@ 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; -- Gitblit v1.8.0