From c24b03d43977b75db84e03bfcdbe3a7b1ae2c1ea Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 07 三月 2019 11:30:00 +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/main.cpp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/main.cpp b/QiaoJiaSystem/VideoToImageMulth/main.cpp
index fbc65f7..6403ebd 100644
--- a/QiaoJiaSystem/VideoToImageMulth/main.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/main.cpp
@@ -66,7 +66,8 @@
int arg1 = atoi(argv[1]);
int gindx = abs(arg1) % 2;
- int GB28181_Enable = abs(arg1) % 2;
+ int GB28181_Enable = arg1 < 0 ? gindx : -1;
+
DBG(gindx);
appPref.setIntData("GB28181_Enable", GB28181_Enable);
appPref.setLongData("gpu.index", gindx);
--
Gitblit v1.8.0