From 99221e4721a1246883465c2b52fbff14eb9aaa7a Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期六, 30 三月 2019 12:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into yangwu1.3
---
QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
index aedff6b..8a1d652 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
+++ b/QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
@@ -101,12 +101,12 @@
p_this->m_running = true;
p_this->m_fFmpegDecoderJPG.startThd(p_this->m_chanPubID, p_this->m_fps, p_this->m_gpuIdx);
while (p_this->m_running) {
- if(p_this->m_fFmpegDecoderJPG.getRunning()) {
+// if(p_this->m_fFmpegDecoderJPG.getRunning()) {
usleep(300000);
- }else{
- p_this->m_running = false;
- break;
- }
+// }else{
+// p_this->m_running = false;
+// break;
+// }
}
DBG("videoCaptureElementThd stop ...");
C_RealVideoStop(lrealhandle);
--
Gitblit v1.8.0