 winlin
|
5fec59ace2
merge from srs2, fix #503
|
7 éve |
|
winlin
|
15570d93ce
change conf to console without daemon.
|
7 éve |
|
winlin
|
8588a10775
Merge branch '2.0release' into develop
|
7 éve |
|
winlin
|
a37a14377a
fix the example dvr config file error
|
7 éve |
|
winlin
|
01c46bdbfd
rename org simle-rtmp-server to ossrs
|
9 éve |
|
winlin
|
1ffd5fd455
rename org simple-rtmp-server to ossrs
|
9 éve |
|
winlin
|
2b9869ee52
update the wiki for dvr
|
9 éve |
|
winlin
|
115daa3cc1
migarate from winlinvip to srs org
|
9 éve |
|
winlin
|
fcab17741c
fix #222, the dvr path rule changed.
|
9 éve |
|
winlin
|
59f68a2655
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
|
10 éve |
|
winlin
|
e46e7fc596
update readme, rename wiki/xxx to wiki/v1_xxx
|
10 éve |
|
winlin
|
ebf9e560b1
refine the max connections, compare the system ulimit max open files, error when exeed limit
|
10 éve |
|
winlin
|
6bc0ecece7
add dvr, http heartbeat conf sample
|
10 éve |
