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 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index d757c14..662f3db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,5 @@
 
 QiaoJiaSystem/build/\.fuse_hidden*
 
+
+QiaoJiaSystem/enctest/cmake-build-debug/

--
Gitblit v1.8.0