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 SRS2

Browse source
This commit is contained in:
winlin 2017-05-01 16:44:14 +08:00
commit f97260be1d
8 changed files with 119 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -992,6 +992,13 @@ void SrsHls::dispose()
on_unpublish();
}
// Ignore when hls_dispose disabled.
// @see https://github.com/ossrs/srs/issues/865
int hls_dispose = _srs_config->get_hls_dispose(req->vhost);
if (!hls_dispose) {
return;
}
controller->dispose();
}