From c618229487739c5965ec8676e93ea7b0fe5a69bd Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 8 Dec 2013 13:17:39 +0800
Subject: [PATCH] regression test ok

---
 trunk/conf/srs.conf | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf
index 436fbc104..fdfe601f3 100755
--- a/trunk/conf/srs.conf
+++ b/trunk/conf/srs.conf
@@ -81,12 +81,11 @@ vhost __defaultVhost__ {
 vhost dev {
     enabled         on;
     gop_cache       on;
-    hls             off;
+    hls             on;
     hls_path        ./objs/nginx/html;
     hls_fragment    5;
     hls_window      30;
-    #forward         127.0.0.1:19350;
-    #forward         127.0.0.1:1936;
+    forward         127.0.0.1:19350;
     http_hooks {
         enabled         on;
         on_connect      http://127.0.0.1:8085/api/v1/clients;
@@ -97,10 +96,10 @@ 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         off;
+            enabled         on;
             vfilter {
             }
             vcodec          libx264;