merge from 2.0

2015-05-23 18:11:33 +08:00 · 2015-05-23 18:11:33 +08:00 · 829b3a392b
commit 829b3a392b
parent 03c6aa37ad d63242b6e8
2 changed files with 364 additions and 648 deletions
--- a/README.md
+++ b/README.md
--- a/trunk/src/protocol/srs_http_stack.cpp
+++ b/trunk/src/protocol/srs_http_stack.cpp
@ -23,6 +23,7 @@

 #include <srs_http_stack.hpp>

+#include <stdlib.h>
 #include <sstream>
 using namespace std;