From 97435c6bb4b91f7b35a76c3d0d0d5440f9e3b01a Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 26 Mar 2014 16:57:20 +0800
Subject: [PATCH] fix demo.conf bug, remove the log_dir, because it's renamed
 to ff_log_dir

---
 README.md            | 1 +
 trunk/conf/demo.conf | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fb59ff309..c606b0494 100755
--- a/README.md
+++ b/README.md
@@ -178,6 +178,7 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv
 * nginx v1.5.0: 139524 lines <br/>
 
 ## History
+* v1.0, 2014-03-26, Support RTMP ATC for HLS/HDS to support backup(failover).
 * v1.0, 2014-03-23, support daemon, default start in daemon.
 * v1.0, 2014-03-22, support make install/install-api and uninstall.
 * v1.0, 2014-03-22, add ./etc/init.d/srs, refine to support make clean then make.
diff --git a/trunk/conf/demo.conf b/trunk/conf/demo.conf
index b3c21a9af..191675302 100644
--- a/trunk/conf/demo.conf
+++ b/trunk/conf/demo.conf
@@ -4,7 +4,6 @@
 
 listen              1935;
 chunk_size          60000;
-log_dir             ./objs/logs;
 max_connections     2000;
 
 vhost __defaultVhost__ {