From 94fb022ef9116147921f5ccc8e60e9d8015ce2c8 Mon Sep 17 00:00:00 2001
From: wenjiegit <wenjie@localhost.(none)>
Date: Fri, 13 Dec 2013 03:51:02 +0800
Subject: [PATCH] merge srs.conf

---
 trunk/conf/srs.conf | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf
index 8f324c733..70ff976b0 100755
--- a/trunk/conf/srs.conf
+++ b/trunk/conf/srs.conf
@@ -1,14 +1,5 @@
 # the listen ports, split by space.
 listen              1935;
-<<<<<<< HEAD
-=======
-# the default chunk size is 128, max is 65536,
-# some client does not support chunk size change,
-# however, most clients supports it and it can improve 
-# performance about 10%.
-# default: 4096
-chunk_size          65000;
->>>>>>> upstream/master
 # the logs dir.
 # if enabled ffmpeg, each stracoding stream will create a log file.
 # default: ./objs/logs
@@ -105,15 +96,12 @@ vhost dev {
     gop_cache       on;
     queue_length    10;
     forward         127.0.0.1:19350;
-<<<<<<< HEAD
-=======
     hls {
         enabled         on;
         hls_path        ./objs/nginx/html;
         hls_fragment    5;
         hls_window      30;
     }
->>>>>>> upstream/master
     http_hooks {
         enabled         off;
         on_connect      http://127.0.0.1:8085/api/v1/clients;
@@ -124,7 +112,7 @@ vhost dev {
         on_stop         http://127.0.0.1:8085/api/v1/sessions;
     }
     transcode {
-        enabled     off;
+        enabled     on;
         ffmpeg      ./objs/ffmpeg/bin/ffmpeg;
         engine dev {
             enabled         on;