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 from 2.0

Browse source
This commit is contained in:
winlin 2016-09-02 15:25:20 +08:00
commit 8ad7da1cb6
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_forward.cpp Normal file → Executable file
View file

@ -65,8 +65,6 @@ SrsForwarder::SrsForwarder(SrsSource* s)
SrsForwarder::~SrsForwarder() SrsForwarder::~SrsForwarder()
{ {
on_unpublish();
srs_freep(sdk); srs_freep(sdk);
srs_freep(pthread); srs_freep(pthread);
srs_freep(queue); srs_freep(queue);

1
trunk/src/app/srs_app_st.cpp Normal file → Executable file
View file

@ -567,6 +567,7 @@ void srs_close_stfd(st_netfd_t& stfd)
// we must ensure the close is ok. // we must ensure the close is ok.
int err = st_netfd_close(stfd); int err = st_netfd_close(stfd);
srs_assert(err != -1); srs_assert(err != -1);
stfd = NULL;
} }
} }