13 Commits (9cdd506b4f993bbbd61e7ad2be3ca6f5356327e8)

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