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-05 14:16:24 +08:00
commit 0e9318e5d8
7 changed files with 102 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,7 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_app_utility.hpp>
#include <srs_app_log.hpp>
namespace internal
{
@ -248,6 +249,12 @@ namespace internal
obj->thread_cycle();
// for valgrind to detect.
SrsThreadContext* ctx = dynamic_cast<SrsThreadContext*>(_srs_context);
if (ctx) {
ctx->clear_cid();
}
st_thread_exit(NULL);
return NULL;