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

Browse source
This commit is contained in:
winlin 2015-12-22 16:18:09 +08:00
commit b881166f9a
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -1288,6 +1288,7 @@ Winlin
[bug #511]: https://github.com/ossrs/srs/issues/511 [bug #511]: https://github.com/ossrs/srs/issues/511
[bug #518]: https://github.com/ossrs/srs/issues/518 [bug #518]: https://github.com/ossrs/srs/issues/518
[bug #541]: https://github.com/ossrs/srs/issues/541 [bug #541]: https://github.com/ossrs/srs/issues/541
[bug #546]: https://github.com/ossrs/srs/issues/546
[bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
[exo #828]: https://github.com/google/ExoPlayer/pull/828 [exo #828]: https://github.com/google/ExoPlayer/pull/828

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

@ -237,11 +237,13 @@ namespace internal
// readly terminated now. // readly terminated now.
really_terminated = true; really_terminated = true;
// when thread terminated normally, also disposed.
// we must set to disposed before the on_thread_stop, which may free the thread.
// @see https://github.com/ossrs/srs/issues/546
disposed = true;
handler->on_thread_stop(); handler->on_thread_stop();
srs_info("thread %s cycle finished", _name); srs_info("thread %s cycle finished", _name);
// when thread terminated normally, also disposed.
disposed = true;
} }
void* SrsThread::thread_fun(void* arg) void* SrsThread::thread_fun(void* arg)