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 the app http to conn.

Browse source
This commit is contained in:
winlin 2015-05-22 22:34:03 +08:00
parent ce1bb6c605
commit f0ae66a081
10 changed files with 1276 additions and 1275 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/main/srs_main_ingest_hls.cpp
View file

@ -47,6 +47,7 @@ using namespace std;
#include <srs_app_utility.hpp>
#include <srs_rtmp_amf0.hpp>
#include <srs_raw_avc.hpp>
#include <srs_app_http_conn.hpp>
// pre-declare
int proxy_hls2rtmp(std::string hls, std::string rtmp);