From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:54:33 +0800
Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3
---
QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt b/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
index c8c2842..1a0c06c 100644
--- a/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
+++ b/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
@@ -93,16 +93,18 @@
../../../BasicPlatForm/libs/hiredis-master/lib
../../../BasicPlatForm/libs/mysqlpp/lib
- ../../../BasicPlatForm/libs/mysql/lib
+ ../../../BasicPlatForm/libs/mysql/lib
)
add_executable(${PROJECT_NAME}
+
+ ./pushStream/PushStreamAppPipeController.cpp
../GB28181DecoderModel/FFmpegDecoderJPG.cpp
../GB28181DecoderModel/GB28181Server.cpp
../GB28181DecoderModel/VideoCaptureElementWithRtp.cpp
- ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+ # ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
- # ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
+# ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
../VideoServer/QiaoJia/DB/LDBTool.cpp
./rpc/RtspAnalysServer.cpp
RtspCaptureElement.cpp
--
Gitblit v1.8.0