5 commits

Author	SHA1	Message	Date
winlin	15570d93ce	change conf to console without daemon.	2017-02-09 14:17:36 +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	5d0cb7e68f	update conf for rtsp	2015-03-01 21:24:01 +08:00
winlin	012c29e124	for #133, update the wiki.	2015-03-01 21:08:44 +08:00