From 25f94726888e19d6efed7b393217d9f56a0ca767 Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期五, 15 三月 2019 18:44:46 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h
index 235cbed..dcfa1d2 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h
+++ b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h
@@ -199,7 +199,8 @@
int stopWrite();
//瀵筽acket鍋氳浆鎹�
- void conversion(void *packet, const long int &firstKeyPts, const long int &firstKeyDts, void *inVideoStream, unsigned long int frame_index = 0);
+ void conversion(void *packet, const long int &firstKeyPts, const long int &firstKeyDts, void *inVideoStream,
+ unsigned long int frame_index = 0);
bool m_bstartWrite = {false};
bool m_bFirstKeyFrame = {false};
@@ -226,6 +227,7 @@
int m_gpuIdx;
int m_fps;
bool m_PackageState;
+ bool m_SnapshotNotSaveRet{true};
std::string m_camIdx;
MyQueue<frameBuffInfo *> m_rtpQueue;
--
Gitblit v1.8.0