external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

merge from srs2

Browse source
This commit is contained in:
winlin 2015-10-01 13:05:25 +08:00
commit 8862ec1988
14 changed files with 56 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/src/protocol/srs_http_stack.cpp
View file

@ -23,6 +23,8 @@
#include <srs_http_stack.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <stdlib.h>
#include <sstream>
#include <algorithm>
@ -777,3 +779,6 @@ char* ISrsHttpMessage::http_ts_send_buffer()
{
return _http_ts_send_buffer;
}
#endif

5
trunk/src/protocol/srs_http_stack.hpp
View file

@ -29,6 +29,8 @@
*/
#include <srs_core.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <map>
#include <string>
#include <vector>
@ -536,3 +538,6 @@ public:
};
#endif
#endif

4
trunk/src/protocol/srs_rtsp_stack.cpp
View file

@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_rtsp_stack.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <stdlib.h>
#include <map>
using namespace std;
@ -1182,3 +1184,5 @@ int SrsRtspStack::recv_token(std::string& token, SrsRtspTokenState& state, char
#endif
#endif

4
trunk/src/protocol/srs_rtsp_stack.hpp
View file

@ -30,6 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <string>
#include <sstream>
@ -714,3 +716,5 @@ private:
#endif
#endif