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 srs2

Browse source
This commit is contained in:
winlin 2016-12-13 17:58:42 +08:00
commit 9ba4bed648
5 changed files with 19 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -709,11 +709,9 @@ int SrsRtmpConn::stream_service_cycle()
rtmp->set_send_timeout(SRS_CONSTS_RTMP_TIMEOUT_US);
// find a source to serve.
SrsSource* source = SrsSource::fetch(req);
if (!source) {
if ((ret = SrsSource::create(req, server, server, &source)) != ERROR_SUCCESS) {
return ret;
}
SrsSource* source = NULL;
if ((ret = SrsSource::fetch_or_create(req, server, server, &source)) != ERROR_SUCCESS) {
return ret;
}
srs_assert(source != NULL);