From 051c6863dd418c9cfbca787e449fbdeadde977c7 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期二, 16 四月 2019 17:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq
---
QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.h | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.h b/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.h
index ea0085f..ac8a21c 100644
--- a/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.h
+++ b/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.h
@@ -20,9 +20,13 @@
//璁剧疆淇濆瓨瑙嗛鐨勬渶灏忓拰鏈�澶ч暱搴�,鍗曚綅鏄,瀹為檯鐨勮繍琛屾儏鍐垫湁涓�浜涘樊璺濓紝闇�瑕佸畬鍠�
void SetVideoMinMaxSeconds(const int minSeconds, const int maxSeconds);
+ void startPublishVideo();
+
+ void stopPublishVideo();
+
private:
BASICGB28181::VideoCaptureElementWithRtp videoCaptureElement;
- ffmpeg::VideoPublishElement* videoPublishElement;
+ ffmpeg::VideoPublishElement *videoPublishElement;
std::string index;
};
--
Gitblit v1.8.0