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/PerimeterAlarm/AppPaController.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/PerimeterAlarm/AppPaController.cpp b/QiaoJiaSystem/PerimeterAlarm/AppPaController.cpp
index de80896..a9d330d 100644
--- a/QiaoJiaSystem/PerimeterAlarm/AppPaController.cpp
+++ b/QiaoJiaSystem/PerimeterAlarm/AppPaController.cpp
@@ -9,7 +9,7 @@
AppPaController:: AppPaController(int index, const ControllerConfig& cfg ):
- videoCaptureElement(cfg.camInfo.strRtsp, 25, 3000, appPref.getLongData("gpu.index"), true),
+ videoCaptureElement(cfg.camInfo.strRtsp, 25, 3000, appPref.getIntData("gpu.index"), true),
m_index(index),
fdfsClient(nullptr),
yoloRpcElement(to_string(index) + "yoloRpc"),
--
Gitblit v1.8.0