3075 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
winlin	2f0ef87d6d	refine code, rename the sync call to common class.	2015-05-23 07:57:45 +08:00
winlin	0bb90145ba	fix #391, copy request for async call.	2015-05-23 07:46:45 +08:00
winlin	6bfb743aa0	remove the unused app http file	2015-05-22 22:38:15 +08:00
winlin	f0ae66a081	merge the app http to conn.	2015-05-22 22:34:03 +08:00
winlin	ce1bb6c605	refine code, extrat the ISrsHttpMessage.	2015-05-22 22:24:05 +08:00
winlin	e2955da78f	refine code, extract the http protocol sdk to module.	2015-05-22 20:47:27 +08:00
winlin	d645411392	refine the kbps comments, add one usage.	2015-05-22 20:31:07 +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	c17a1198cb	fix #399, disconnect when not keep alive.	2015-05-22 16:27:48 +08:00
winlin	46a81372e7	fix #398, set recv timeout for http connection.	2015-05-22 13:57:04 +08:00
winlin	6f8c076b30	add comments for srs thread, add never quit thread.	2015-05-22 12:10:06 +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	5d7b0edccc	merge from bravo code, fix some warnings.	2015-05-22 11:20:25 +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