Commit Graph

9 Commits

Author SHA1 Message Date
winlin
5fec59ace2 merge from srs2, fix #503 2017-02-09 14:33:56 +08:00
winlin
15570d93ce change conf to console without daemon. 2017-02-09 14:17:36 +08:00
winlin
f2efa96015 for #324, always enable hstrs. 3.0.10 2017-01-05 09:08:56 +08:00
winlin
1ffd5fd455 rename org simple-rtmp-server to ossrs 2015-11-11 10:37:50 +08:00
winlin
115daa3cc1 migarate from winlinvip to srs org 2015-04-29 17:06:32 +08:00
winlin
6d15d0ea99 for #324, refine code, add hstrs config. 2015-03-14 09:52:47 +08:00
winlin
a647043a06 update readme and wiki url for http ts stream 2015-01-22 18:39:53 +08:00
winlin
25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux 2015-01-22 09:34:33 +08:00
winlin
eff2d81016 for #293, add http flv stream 2015-01-18 18:00:40 +08:00