1411 commits

Author	SHA1	Message	Date
winlin	069ee0afc3	fix #404, register handler then start http thread. 2.0.167.	2015-05-24 15:19:09 +08:00
winlin	9e342f41a4	add rtmp cluster.	2015-05-24 09:39:03 +08:00
winlin	58b336451d	Merge branch '2.0release' into develop	2015-05-24 09:15:37 +08:00
winlin	94efe3f727	update wiki	2015-05-24 09:15:30 +08:00
winlin	829b3a392b	merge from 2.0	2015-05-23 18:11:33 +08:00
winlin	d63242b6e8	add http flv sample.	2015-05-23 18:10:16 +08:00
winlin	e4c97cde2f	update readme	2015-05-23 16:01:12 +08:00
winlin	2d9103db77	update readme	2015-05-23 15:52:08 +08:00
winlin	dbb37d2a52	update readme	2015-05-23 15:48:24 +08:00
winlin	bbdc8b901b	update readme	2015-05-23 15:20:15 +08:00
winlin	16d386df91	update readme	2015-05-23 15:15:22 +08:00
winlin	982b09f9a7	update readme	2015-05-23 15:11:45 +08:00
winlin	6418801487	update readme	2015-05-23 14:46:24 +08:00
winlin	fe7d5c70d1	update readme	2015-05-23 14:43:55 +08:00
winlin	25d28c1461	update readme	2015-05-23 14:12:06 +08:00
winlin	504d0b9385	update readme	2015-05-23 14:07:04 +08:00
winlin	6f60fefba4	update readme	2015-05-23 13:42:57 +08:00
winlin	6d13178e92	refine readme the features and compare.	2015-05-23 13:22:26 +08:00
winlin	353e37c5b6	rename summary to features.	2015-05-23 13:20:20 +08:00
winlin	03c6aa37ad	Merge branch '2.0release' into develop	2015-05-23 13:10:20 +08:00
winlin	c19856be5c	refine for 2.0	2015-05-23 13:10:11 +08:00
winlin	2b52960b50	Merge branch '2.0release' into develop	2015-05-23 13:07:53 +08:00
winlin	a993462f95	merge from srs1.0	2015-05-23 13:07:47 +08:00
winlin	56f014ecf2	refine the graph of srs arch.	2015-05-23 13:06:02 +08:00
winlin	6b28dec8ec	merge from 2.0release. refine the thread, protocol, kbps code. 2.0.166	2015-05-23 10:05:06 +08:00
winlin	5908096fc3	refine the thread, protocol, kbps code. 2.0.166	2015-05-23 10:04:28 +08:00
winlin	478873fdec	Merge branch '2.0release' into develop	2015-05-23 09:49:23 +08:00
winlin	0bb90145ba	fix #391, copy request for async call.	2015-05-23 07:46:45 +08:00
winlin	7243cdbff6	merge from 2.0release.	2015-05-22 17:20:30 +08:00
winlin	6ca46e84bc	fix #397, the USER_HZ maybe not 100. 2.0.165	2015-05-22 17:16:33 +08:00
winlin	948d200ce1	fix #400, parse when got entire http header, by feilong. 2.0.164.	2015-05-22 12:00:48 +08:00
winlin	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	2015-05-19 18:06:20 +08:00
winlin	f6d2fd991b	merge from 2.0.162	2015-05-10 10:36:49 +08:00
winlin	c617d2aaa5	support push flv stream over HTTP POST to SRS.	2015-05-10 10:35:35 +08:00
winlin	f15e9f5b62	Merge branch '2.0release' into develop	2015-04-30 13:42:53 +08:00
winlin	4d18073dab	update contact add skype.	2015-04-30 13:42:30 +08:00
winlin	5819614ff0	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:49:42 +08:00
winlin	fff838e4c1	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:48:52 +08:00
winlin	9189a408c1	Merge branch '2.0release' into develop	2015-04-29 17:28:23 +08:00
winlin	90b80ffc45	migarate from winlinvip to srs org.	2015-04-29 17:28:15 +08:00
winlin	7d5f1c2be8	Merge branch '2.0release' into develop	2015-04-20 18:31:52 +08:00
winlin	2239e9f1fd	support ingest hls live stream to RTMP.	2015-04-20 16:25:48 +08:00
winlin	6726a88f47	merge from 2.0release	2015-04-15 17:12:57 +08:00
winlin	22ca46350b	fix #383, support mix_correct algorithm. 2.0.161.	2015-04-15 17:12:22 +08:00
winlin	0c939e7114	merge from 2.0.160:	2015-04-13 10:33:08 +08:00
winlin	dcac9c69d5	fix #381, support reap hls/ts by gop or not. 2.0.160.	2015-04-13 10:32:32 +08:00
winlin	17c1423f4a	Merge branch '2.0release' into develop	2015-04-10 12:01:52 +08:00
winlin	e3c6e52547	enhanced on_hls_notify, support HTTP GET when reap ts.	2015-04-10 12:01:45 +08:00
winlin	7dbc95e085	refine the hls deviation for floor algorithm.	2015-04-10 10:21:30 +08:00
winlin	71e1602458	merge from 2.0.159	2015-04-09 12:35:53 +08:00