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

Browse source
This commit is contained in:
winlin 2015-12-15 16:06:40 +08:00
commit 0ab64ccd2a
3 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
trunk/src/app/srs_app_config.cpp
View file

@ -6002,7 +6002,8 @@ double SrsConfig::get_hls_window(string vhost)
string SrsConfig::get_hls_on_error(string vhost)
{
static string DEFAULT = "ignore";
// try to ignore the error.
static string DEFAULT = "continue";
SrsConfDirective* conf = get_hls(vhost);
if (!conf) {