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/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp b/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp
index 553a451..06191c5 100644
--- a/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/pushStream/PushStreamAppPipeController.cpp
@@ -14,7 +14,7 @@
string path = appConfig.getStringProperty("srsAddr") + "cam" + chanPubID + ".flv";
cv::Size size_(appPref.getIntData("pulish.width"), appPref.getIntData("pulish.height"));
- int gupIdx = appPref.getLongData("gpu.index");
+ int gupIdx = appPref.getIntData("gpu.index");
videoPublishElement = new ffmpeg::VideoPublishElement(path, size_, "flv", 25, gupIdx);
if (appPref.getIntData("pulish.width") < 0 || appPref.getIntData("pulish.height") < 0) {
ERR("pulish.width: " << appPref.getIntData("pulish.width") << " Height: "
--
Gitblit v1.8.0