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 branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-03-15 19:34:11 +08:00
commit 0017ee85e0
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/conf/full.conf
View file

@ -477,7 +477,6 @@ vhost http.remux.srs.com {
# whether http stream trigger rtmp stream source when no stream available, # whether http stream trigger rtmp stream source when no stream available,
# for example, when encoder has not publish stream yet, # for example, when encoder has not publish stream yet,
# user can play the http flv stream and wait for stream. # user can play the http flv stream and wait for stream.
# TODO: FIXME: for edge vhost, automatically trigger the backsource connection.
# default: on # default: on
hstrs on; hstrs on;
} }