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

refine code remove dup api for #742

Browse source
This commit is contained in:
winlin 2017-01-16 16:20:34 +08:00
parent 1ed5118246
commit f4c0af8bfc
6 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,7 @@ using namespace std;
#include <srs_raw_avc.hpp>
#include <srs_app_http_conn.hpp>
#include <srs_app_rtmp_conn.hpp>
#include <srs_protocol_utility.hpp>
// pre-declare
int proxy_hls2rtmp(std::string hls, std::string rtmp);
@ -1185,7 +1186,7 @@ int SrsIngestSrsOutput::rtmp_write_packet(char type, u_int32_t timestamp, char*
SrsSharedPtrMessage* msg = NULL;
if ((ret = sdk->rtmp_create_msg(type, timestamp, data, size, &msg)) != ERROR_SUCCESS) {
if ((ret = srs_rtmp_create_msg(type, timestamp, data, size, sdk->sid(), &msg)) != ERROR_SUCCESS) {
srs_error("mpegts: create shared ptr msg failed. ret=%d", ret);
return ret;
}