From ae3f7d9cb8f4c51292b643034e97ebc942917579 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 16 Apr 2014 16:18:02 +0800
Subject: [PATCH] change meeting hls to an

---
 trunk/conf/demo.conf             | 7 +------
 trunk/src/app/srs_app_thread.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/trunk/conf/demo.conf b/trunk/conf/demo.conf
index 4c29eebfa..e5cfdab6f 100644
--- a/trunk/conf/demo.conf
+++ b/trunk/conf/demo.conf
@@ -202,12 +202,7 @@ vhost players_chat {
             vparams {
                 g           30;
             }
-            acodec          libaacplus;
-            abitrate        30;
-            asample_rate    44100;
-            achannels       2;
-            aparams {
-            }
+            acodec          an;
             output          rtmp://127.0.0.1:[port]/[app]?vhost=chat_hls/[stream];
         }
     }
diff --git a/trunk/src/app/srs_app_thread.cpp b/trunk/src/app/srs_app_thread.cpp
index 7b7f96bfe..3e360bef2 100644
--- a/trunk/src/app/srs_app_thread.cpp
+++ b/trunk/src/app/srs_app_thread.cpp
@@ -122,12 +122,12 @@ void SrsThread::thread_cycle()
 {
     int ret = ERROR_SUCCESS;
     
-    _cid = _srs_context->get_id();
-    srs_assert(handler);
-    
     _srs_context->generate_id();
     srs_info("thread cycle start");
-
+    
+    _cid = _srs_context->get_id();
+    
+    srs_assert(handler);
     handler->on_thread_start();
     
     loop = true;