3553 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	e4c852945f	refine code, support override vhost	2015-10-23 14:42:02 +08:00
winlin	a9ad7b211b	refine simple rtmp client for post flv stream.	2015-10-23 14:42:02 +08:00
winlin	adb8f243bf	use simple rtmp client for raw connect app	2015-10-23 14:42:02 +08:00
winlin	24b3899972	use SrsTcpClient instead raw socket.	2015-10-23 14:42:02 +08:00
winlin	a9bb6061c3	use tcp client for raw connect.	2015-10-23 14:42:02 +08:00
winlin	20fcfb3eee	fix bug, use system utility	2015-10-23 14:42:02 +08:00
winlin	69cc01b696	use system utilities	2015-10-23 14:42:02 +08:00
winlin	908365a61a	use string for const char*	2015-10-23 14:42:02 +08:00
winlin	d9f991ed2f	use system utility for string finds	2015-10-23 14:42:02 +08:00
winlin	ca73534d7e	refine comments for api key	2015-10-23 14:42:01 +08:00
winlin	21deeb8649	update donation for zanjie.	2015-10-22 23:54:25 +08:00
winlin	9d471199ea	update donations	2015-10-21 21:40:55 +08:00
winlin	d115f53770	merge from srs2	2015-10-20 16:41:59 +08:00
winlin	95d38b7b29	update realease	2015-10-20 16:01:26 +08:00
winlin	bd208c762d	update readme	2015-10-20 15:58:10 +08:00
winlin	29122b6e70	fix #502, transcoder support snapshot.	2015-10-20 14:52:34 +08:00
winlin	2bae6e09d3	for #502, snapshot 1 image per 1 seconds, choose best from 5 images.	2015-10-20 14:10:14 +08:00
winlin	1aa4502d5f	for snapshot, choose the best to link to the [stream]-best.png	2015-10-20 13:38:03 +08:00
winlin	33a282e576	support snapshot by http hooks for #152.	2015-10-20 12:30:57 +08:00
winlin	9eebb89432	Merge branch '2.0release' into develop	2015-10-20 10:17:54 +08:00
winlin	91e9fc7e5b	fix typo of INVLIAD to INVALID	2015-10-20 10:17:48 +08:00
winlin	57a3b11b86	merge from srs2	2015-10-13 11:48:02 +08:00
winlin	5de65d41f4	Merge pull request #499 from synote/2.0release ... fix bug for build failure when configure with --log-info	2015-10-12 10:07:08 +08:00
winlin	b5ba1043e8	Merge branch '2.0release' into develop	2015-10-08 16:07:54 +08:00
winlin	9c2eafc244	refine the git command	2015-10-08 15:53:49 +08:00
winlin	c8c4673231	release srs 2.0 alpha2, 2.0.195	2015-10-08 09:27:53 +08:00
winlin	320f126b7e	release srs 2.0 alpha2, 2.0.195	2015-10-08 09:27:25 +08:00
winlin	fbff42b33a	release srs 2.0 alpha2, 2.0.195	2015-10-08 09:27:04 +08:00
winlin	6d488541bd	release srs 2.0 alpha2, 2.0.195	2015-10-08 09:26:04 +08:00
winlin	56412edb5f	release srs 2.0 alpha2, 2.0.195	2015-10-08 09:25:28 +08:00
winlin	1675c4b721	release srs 2.0 alpha2, 2.0.195	2015-10-08 09:19:30 +08:00
winlin	ed80d9d281	merge from srs2	2015-10-04 08:10:57 +08:00
winlin	0c8209cccd	fix #448, fix the bug of response of http hooks. 2.0.195	2015-10-04 08:09:39 +08:00
winlin	6587c5b2f1	merge from srs2	2015-10-01 13:22:51 +08:00
winlin	7811b4f3f7	fix #497, response error when client not found to kickoff. 2.0.194	2015-10-01 13:20:13 +08:00
winlin	8862ec1988	merge from srs2	2015-10-01 13:05:25 +08:00
winlin	a3c229472e	fix #495, decrease the srs-librtmp size. 2.0.193	2015-10-01 13:04:28 +08:00
winlin	070ada1d6e	Merge branch '2.0release' into develop	2015-10-01 12:30:55 +08:00
winlin	65e4bf2e77	fix compile failed bug.	2015-10-01 12:30:38 +08:00
winlin	d8f18aee37	use the right int type for port.	2015-09-24 18:33:07 +08:00
winlin	1c7d5f1852	Merge branch '2.0release' into develop	2015-09-24 17:55:33 +08:00
winlin	353e3260b8	remove duplicated code	2015-09-24 17:55:27 +08:00
winlin	9ead08725d	use kernel utility int2str and float2str	2015-09-24 17:54:58 +08:00
winlin	6efd2dd27e	add load balance round robin for brokers.	2015-09-24 17:20:04 +08:00
winlin	2a4ab8a923	add brokers to config	2015-09-24 14:53:22 +08:00
winlin	f187a7deef	refine the startup logs.	2015-09-24 12:15:12 +08:00
winlin	3ab0ccaa27	Merge branch '2.0release' into develop	2015-09-23 18:23:17 +08:00
winlin	7cdcf41d26	refine the api server	2015-09-23 18:23:09 +08:00
winlin	afd6428366	refine code of server.	2015-09-23 17:21:57 +08:00
winlin	8b6c78b862	Merge branch '2.0release' into develop	2015-09-23 16:42:47 +08:00