26 commits

Author	SHA1	Message	Date
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	664844b5f5	merge from srs2. for #513.	2016-12-15 14:54:09 +08:00
winlin	9ba4bed648	merge srs2	2016-12-13 17:58:42 +08:00
winlin	cb1d47bfef	fix #713, refine source to avoid critical fetch and create. 2.0.222	2016-12-13 17:57:49 +08:00
winlin	5796e4bf89	merge from srs2	2016-10-26 09:53:27 +08:00
hankun	4f09bcce9f	fix the bug: when trying to push same stream more than twice, to play it through http-flv will cause a core dump(#666)	2016-10-20 10:49:59 +08:00
winlin	7ae2c6bf50	merge from srs2.	2015-12-26 12:17:51 +08:00
winlin	eca46c03d2	refine code for consumer to refer the rtmp connection.	2015-12-26 12:13:17 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +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	d9f991ed2f	use system utility for string finds	2015-10-23 14:42:02 +08:00
winlin	df6ac8842c	rename rtmp utility to protocol utility	2015-09-22 09:11:07 +08:00
winlin	d32632ee8a	rename SrsFastBuffer to SrsFastStream	2015-09-22 09:01:47 +08:00
winlin	0e52fc6d5b	rename SrsStream to SrsBuffer	2015-09-22 08:57:31 +08:00
winlin	1fd83d9314	refine the order.	2015-09-17 13:36:02 +08:00
winlin	c31a546eec	support vhost for http flv.	2015-08-21 12:08:25 +08:00
winlin	ccf6a4de1e	remove the on_reload_vhost_http_remux_updated for vhost added.	2015-08-03 13:35:25 +08:00
winlin	3b65af9bd2	fix the hstrs bug on edge.	2015-07-17 14:05:34 +08:00
winlin	99db2888e7	refine code for hstrs.	2015-07-16 18:42:27 +08:00
zhengfl	a5a9f7c8c5	refine code:优化edge模式回源播放线程启动流程	2015-07-16 11:36:14 +08:00
winlin	d995726fee	fix the http flv mount bug.	2015-07-14 11:31:17 +08:00
winlin	50feaacdde	refine code for http remux reload.	2015-07-10 13:45:21 +08:00
winlin	0aa053433c	fix #132: build failed when enable the info or verbose log.	2015-07-10 11:50:35 +08:00
winlin	bed540bac9	fix #439: http remux support reload	2015-07-09 13:52:41 +08:00
winlin	f8f6e438cc	extract http static and http stream from http conn.	2015-06-14 14:06:39 +08:00