merge from 2.0
This commit is contained in:
commit
8ad7da1cb6
2
trunk/src/app/srs_app_forward.cpp
Normal file → Executable file
2
trunk/src/app/srs_app_forward.cpp
Normal file → Executable file
|
|
@ -65,8 +65,6 @@ SrsForwarder::SrsForwarder(SrsSource* s)
|
|||
|
||||
SrsForwarder::~SrsForwarder()
|
||||
{
|
||||
on_unpublish();
|
||||
|
||||
srs_freep(sdk);
|
||||
srs_freep(pthread);
|
||||
srs_freep(queue);
|
||||
|
|
|
|||
1
trunk/src/app/srs_app_st.cpp
Normal file → Executable file
1
trunk/src/app/srs_app_st.cpp
Normal file → Executable file
|
|
@ -567,6 +567,7 @@ void srs_close_stfd(st_netfd_t& stfd)
|
|||
// we must ensure the close is ok.
|
||||
int err = st_netfd_close(stfd);
|
||||
srs_assert(err != -1);
|
||||
stfd = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user