From 6540a2a9d69432c4cc475e3b32eae11e9e0ace73 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 11 四月 2019 20:28:10 +0800
Subject: [PATCH] 1.srs的分辨率在config.json配置 2.单播推流控制，国标摄像机差一个关闭测试 3. 底库字段添加

---
 .gitignore |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6e1289a..662f3db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,24 @@
 
 QiaoJiaSystem/build/glog_dump\.log
 
+QiaoJiaSystem/CMakeLists\.txt\.user
+
+\.idea/
+
+QiaoJiaSystem/build/\.fuse_hidden0001973000000002
+
+QiaoJiaSystem/DataManagerServer/cmake-build-debug/
+
+QiaoJiaSystem/VideoAnalysFromHC/cmake-build-debug/
+
+QiaoJiaSystem/build/glog_dump\.log
+*/cmake-build-debug/
+\.idea/
+
+QiaoJiaSystem/build/\.fuse_hidden00020f790000007d
+
+QiaoJiaSystem/build/\.fuse_hidden000210720000007e
+
 \.idea/
 
 QiaoJiaSystem/VideoAnalysFromHC/cmake-build-debug/
@@ -38,3 +56,5 @@
 
 QiaoJiaSystem/build/\.fuse_hidden*
 
+
+QiaoJiaSystem/enctest/cmake-build-debug/

--
Gitblit v1.8.0