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

Fix #908, use empty coroutine to avoid NULL pointer.

Browse source
This commit is contained in:
winlin 2017-06-04 19:13:56 +08:00
parent 0e9e1792fe
commit 9ca36970aa
17 changed files with 115 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ static std::vector<std::string> _transcoded_url;
SrsEncoder::SrsEncoder()
{
trd = NULL;
trd = new SrsDummyCoroutine();
pprint = SrsPithyPrint::create_encoder();
}
@ -74,7 +74,7 @@ int SrsEncoder::on_publish(SrsRequest* req)
// start thread to run all encoding engines.
srs_freep(trd);
trd = new SrsCoroutine("encoder", this, _srs_context->get_id());
trd = new SrsSTCoroutine("encoder", this, _srs_context->get_id());
if ((ret = trd->start()) != ERROR_SUCCESS) {
srs_error("st_thread_create failed. ret=%d", ret);
return ret;