From 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 30 三月 2019 17:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq
---
QiaoJiaSystem/RapidStructureApp/RapidAppPipeController.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/RapidStructureApp/RapidAppPipeController.cpp b/QiaoJiaSystem/RapidStructureApp/RapidAppPipeController.cpp
index 599012f..45d27ea 100644
--- a/QiaoJiaSystem/RapidStructureApp/RapidAppPipeController.cpp
+++ b/QiaoJiaSystem/RapidStructureApp/RapidAppPipeController.cpp
@@ -6,7 +6,7 @@
#include <algorithm>
RapidAppPipeController::RapidAppPipeController(int index, const Json::Value &json, const std::string &outPath) :
- videoCaptureElement(json["rtsp"].asString(), outPath, 25, -1, 0),//appPref.getLongData("gpu.index")
+ videoCaptureElement(json["rtsp"].asString(), outPath, 25, -1, 0),//appPref.getIntData("gpu.index")
index(index), bUp(false), m_json(json),
/*yoloRpcElement(to_string(index)+"yoloRpc"),*/triggerElement(0, 3) {
videoCaptureElement.registerConnector([&] {
--
Gitblit v1.8.0