external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into feature/rtc

Browse source
This commit is contained in:
winlin 2020-08-31 13:39:03 +08:00
commit fa1ccaa9f2
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_gb28181_sip.cpp
View file

@ -783,8 +783,6 @@ srs_error_t SrsGb28181SipService::send_sip_raw_data(SrsSipRequest *req, std::st
srs_error_t SrsGb28181SipService::send_query_catalog(SrsSipRequest *req) srs_error_t SrsGb28181SipService::send_query_catalog(SrsSipRequest *req)
{ {
srs_error_t err = srs_success;
srs_assert(req); srs_assert(req);
SrsGb28181SipSession *sip_session = fetch(req->sip_auth_id); SrsGb28181SipSession *sip_session = fetch(req->sip_auth_id);
@ -919,7 +917,7 @@ srs_error_t SrsGb28181SipService::fetch_or_create_sip_session(SrsSipRequest *req
if ((sess = fetch(req->sip_auth_id)) != NULL) { if ((sess = fetch(req->sip_auth_id)) != NULL) {
*sip_session = sess; *sip_session = sess;
return err; return err;
} }
sess = new SrsGb28181SipSession(this, req);; sess = new SrsGb28181SipSession(this, req);;
if ((err = sess->serve()) != srs_success) { if ((err = sess->serve()) != srs_success) {