From 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:57:19 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' into 1.3nsq

---
 QiaoJiaSystem/YoloServer/YoloDetectClientTest.cpp |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/QiaoJiaSystem/YoloServer/YoloDetectClientTest.cpp b/QiaoJiaSystem/YoloServer/YoloDetectClientTest.cpp
index bb406ce..db69b5f 100644
--- a/QiaoJiaSystem/YoloServer/YoloDetectClientTest.cpp
+++ b/QiaoJiaSystem/YoloServer/YoloDetectClientTest.cpp
@@ -75,12 +75,10 @@
     appPref.setIntData("yolo.port", 10003);
 //    rpcClient(appPref.getStringData("yolo.proxy"), appPref.getStringData("yolo.ip"), appPref.getLongData("yolo.port"),"tcp"),
 
-    Controllor *_Controllor = new Controllor(1, "/home/bsk/210235C23NF187000045$2019-02-28-23-07-30_209850_210049.mp4");
+    Controllor *_Controllor = new Controllor(1, "/home/basic/geth264.h264");
     _Controllor->start();
 
     getchar();
-
-
 
 
     YoloRpcElement m_YoloRpcElement("YoloRpc");

--
Gitblit v1.8.0