4 commits

Author	SHA1	Message	Date
wenjiegit	3753e8c5f1	merge upstream	2013-12-24 10:38:38 +08:00
winlin	ee79f4a52f	update the conf, add demo.srs.com, add players and players_pub, add __defaultVhost__ for rtmp	2013-12-22 00:08:17 +08:00
wenjie	6e9f375606	+server support band check +every vhost can have it's own chunk size	2013-12-12 20:56:19 +08:00
winlin	5502344e85	add forward sample	2013-12-01 12:16:57 +08:00