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
|
8588a10775
|
Merge branch '2.0release' into develop
|
2017-01-29 17:15:43 +08:00 |
|
winlin
|
a37a14377a
|
fix the example dvr config file error
|
2017-01-29 17:15:17 +08:00 |
|
winlin
|
01c46bdbfd
|
rename org simle-rtmp-server to ossrs
|
2015-11-11 10:45:45 +08:00 |
|
winlin
|
1ffd5fd455
|
rename org simple-rtmp-server to ossrs
|
2015-11-11 10:37:50 +08:00 |
|
winlin
|
2b9869ee52
|
update the wiki for dvr
|
2015-09-15 17:58:35 +08:00 |
|
winlin
|
115daa3cc1
|
migarate from winlinvip to srs org
|
2015-04-29 17:06:32 +08:00 |
|
winlin
|
fcab17741c
|
fix #222, the dvr path rule changed.
|
2015-03-23 22:06:18 +08:00 |
|
winlin
|
59f68a2655
|
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
|
2014-10-24 11:35:06 +08:00 |
|
winlin
|
e46e7fc596
|
update readme, rename wiki/xxx to wiki/v1_xxx
|
2014-10-24 09:58:53 +08:00 |
|
winlin
|
ebf9e560b1
|
refine the max connections, compare the system ulimit max open files, error when exeed limit
|
2014-07-26 15:34:45 +08:00 |
|
winlin
|
6bc0ecece7
|
add dvr, http heartbeat conf sample
|
2014-05-22 17:13:57 +08:00 |
|