3261 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	27a1fee6b9	Merge branch '2.0release' into develop	2015-05-28 21:02:50 +08:00
winlin	af4eec90ac	for srs-dolphin, support HTTP and RTMP.	2015-05-28 21:02:43 +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	394e070b2e	support dolphin	2015-05-28 14:59:12 +08:00
winlin	e5461d2df9	refine code	2015-05-28 07:03:38 +08:00
winlin	60775485c4	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	2015-05-27 23:44:07 +08:00
winlin	385ee893f5	update readme	2015-05-27 23:43:44 +08:00
zhengfl	4864e796d6	fix #408:Queue丢视频时，不应该丢弃SequenceHeader	2015-05-27 16:16:15 +08:00
winlin	7e04975b8d	fix the test configure script	2015-05-27 11:38:10 +08:00
winlin	1150cde829	fix the verbose build failed.	2015-05-27 11:12:52 +08:00
winlin	ca01bd407b	fix the bug of test configure script.	2015-05-27 10:55:46 +08:00
winlin	fec8422d6b	fix bug of configure.	2015-05-27 10:23:40 +08:00
winlin	eb488e3bde	fix the test configure script bug	2015-05-27 07:32:51 +08:00
winlin	02c4741d64	add usage and make jobs support for configure test script	2015-05-27 07:30:37 +08:00
winlin	c1b9541b5c	support disable all	2015-05-27 07:22:44 +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	409c1e4823	Merge branch '2.0release' into develop	2015-05-25 08:17:22 +08:00
winlin	2e1ca3c751	fix the build failed bug.	2015-05-25 08:17:11 +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	8a9dbaefb7	use cache for flv tag header.	2015-05-24 23:16:56 +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	b53e9814b3	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	2015-05-24 21:17:26 +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	2661e3c419	Merge branch '2.0release' into develop	2015-05-24 18:57:02 +08:00
winlin	cf9ee04611	fix the utest build failed bug.	2015-05-24 18:56:52 +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	a45cf38d44	auto detect the sed command for osx.	2015-05-24 14:52:37 +08:00
winlin	f510a3d6fb	add /api/v1/versions for http server for go-sharp to detect.	2015-05-24 13:01:23 +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	5840bc1053	add flv cluster confs.	2015-05-24 08:41:29 +08:00
winlin	7571d70f16	fix the build failed bug.	2015-05-23 19:32:27 +08:00
winlin	2f66c8dd09	Merge branch '2.0release' into develop	2015-05-23 19:22:45 +08:00
winlin	93a1d097dc	update jwplayer to support play HTTP flv.	2015-05-23 19:22:37 +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	e96150b7db	update readme	2015-05-23 15:22:20 +08:00
winlin	bbdc8b901b	update readme	2015-05-23 15:20:15 +08:00