889 commits

Author	SHA1	Message	Date
winlin	b0ce38dc8f	merge from 2.0	2015-06-10 15:38:44 +08:00
winlin	56938efdbd	fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175	2015-06-10 15:38:13 +08:00
winlin	12eab8a128	merge from srs2.	2015-06-10 13:53:57 +08:00
winlin	6941f2c072	fix #424, fix aggregate timestamp bug. 2.0.174	2015-06-10 13:53:13 +08:00
winlin	5d75e32e1d	Merge branch '2.0release' into develop	2015-06-06 21:24:06 +08:00
winlin	a1dd734318	fix #421, drop video for unkown RTMP header.	2015-06-06 21:23:57 +08:00
winlin	d10d57716a	Merge branch '2.0release' into develop	2015-06-05 21:34:39 +08:00
winlin	26b76c0e4c	fix #420, remove ts for hls ram mode.	2015-06-05 20:38:01 +08:00
winlin	9dce971d57	merge from srs2	2015-05-30 14:41:47 +08:00
winlin	223ae194b1	fix #209, cleanup hls when stop and timeout. 2.0.173.	2015-05-30 14:41:09 +08:00
winlin	4a80a5a71e	for #209, support cleanup when srs stop.	2015-05-30 13:48:29 +08:00
winlin	597993d414	support pure video hls.	2015-05-29 21:53:37 +08:00
winlin	5caafadd45	fix #409: support pure video hls. 2.0.172.	2015-05-29 21:43:17 +08:00
winlin	3ad030fe83	add HLS overload	2015-05-29 17:56:05 +08:00
winlin	27a1fee6b9	Merge branch '2.0release' into develop	2015-05-28 21:02:50 +08:00
winlin	41ead65345	support [srs-dolphin][srs-dolphin], the multiple-process SRS.	2015-05-28 19:58:16 +08:00
winlin	b44987fac7	Merge branch '2.0release' into develop	2015-05-28 14:59:19 +08:00
winlin	9ab579c6e8	refine the configure test script.	2015-05-27 07:06:16 +08:00
winlin	7349fed8b1	Merge branch '2.0release' into develop	2015-05-25 09:59:57 +08:00
winlin	8afeb29d8d	update readme	2015-05-25 09:27:25 +08:00
winlin	cd162c2848	merge from 2.0	2015-05-25 01:04:04 +08:00
winlin	9e9f38133d	update readme.	2015-05-25 01:03:34 +08:00
winlin	d12fc7fcc5	fix #405, improve the HTTP FLV performance to 6k. 2.0.171	2015-05-25 01:02:06 +08:00
winlin	4df19ba99a	for #405, improve the http flv to 3k. 2.0.170	2015-05-24 23:29:17 +08:00
winlin	0e1ac2b923	update readme	2015-05-24 22:54:49 +08:00
winlin	960341b9b2	for #405, improve the HTT FLV to 3k. 2.0.169	2015-05-24 22:43:02 +08:00
winlin	fc995473eb	for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168	2015-05-24 21:17:00 +08:00
winlin	f540ce307b	merge from 2.0	2015-05-24 15:19:50 +08:00
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