3240 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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	af172d9593	refine script, use PROTOCOL as RTMP.	2015-05-23 09:59:24 +08:00
winlin	68d835021e	refine code, move the kbps to protocol	2015-05-23 09:58:00 +08:00
winlin	478873fdec	Merge branch '2.0release' into develop	2015-05-23 09:49:23 +08:00
winlin	cfc0877ec9	refine the thread, add all callback.	2015-05-23 09:49:15 +08:00
winlin	e5f449ce36	refine the thread to three category.	2015-05-23 09:20:16 +08:00