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/DataManagerServer/demo.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/demo.cpp b/QiaoJiaSystem/DataManagerServer/demo.cpp
index 8907a69..4217194 100644
--- a/QiaoJiaSystem/DataManagerServer/demo.cpp
+++ b/QiaoJiaSystem/DataManagerServer/demo.cpp
@@ -12,7 +12,7 @@
// json["rtsp"] = "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream";
//
// std::string publish_basepath = "rtmp://localhost:1934/live/cam" + std::to_string(554);
-// appPref.setLongData("gpu.index", 0);
+// appPref.setIntData("gpu.index", 0);
// appPref.setStringData("publish.basepath", publish_basepath);
// appPref.setIntData("pulish.width", 640);
// appPref.setIntData("pulish.height", 360);
--
Gitblit v1.8.0