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_http_stream.cpp
View file

@ -1232,11 +1232,9 @@ int SrsHttpStreamServer::hijack(ISrsHttpMessage* request, ISrsHttpHandler** ph)
}
}
SrsSource* s = SrsSource::fetch(r);
if (!s) {
if ((ret = SrsSource::create(r, server, server, &s)) != ERROR_SUCCESS) {
return ret;
}
SrsSource* s = NULL;
if ((ret = SrsSource::fetch_or_create(r, server, server, &s)) != ERROR_SUCCESS) {
return ret;
}
srs_assert(s != NULL);