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/VideoAnalysFromHC/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
index 0d4e6e6..1afbdbf 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
+++ b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
@@ -9,7 +9,7 @@
 set(CMAKE_BUILD_TYPE debug)
 add_compile_options(-fPIC)
 add_definitions(-DGLOG)
-add_definitions(-DGB28181)
+#add_definitions(-DGB28181)
 add_definitions(-DDEBUG_ERR -DDEBUG_INFO -fpermissive)
 SET(SOURCES
 

--
Gitblit v1.8.0