3637 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
winlin	d1de097f5e	fix make clean bug, donot rm when no dir	2015-09-23 16:42:41 +08:00
winlin	396bb43672	Merge branch '2.0release' into develop	2015-09-23 15:46:58 +08:00
winlin	8b1198562a	show cpu info.	2015-09-23 15:46:51 +08:00
winlin	4e88262512	merge from srs2 to check cpus.	2015-09-23 15:11:33 +08:00
winlin	cfe2082353	fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192	2015-09-23 15:09:59 +08:00
winlin	f6e655396c	for #485, support cross build for arm	2015-09-23 11:54:53 +08:00
winlin	d94a88a797	merge from srs2 for pi and cubie.	2015-09-23 11:23:55 +08:00
winlin	16730ea031	refine code for cross build	2015-09-23 11:21:51 +08:00
winlin	6990508e58	for #485, srs for respberrypi and cubieboard. 2.0.191	2015-09-23 11:05:56 +08:00
winlin	f75058413d	Merge branch '2.0release' into develop	2015-09-23 10:39:24 +08:00
winlin	7dcdb18588	support build on pi and cubie	2015-09-23 10:27:57 +08:00
winlin	a8829e0a8b	support build on pi or cubie.	2015-09-23 10:22:58 +08:00
winlin	9a9483e7d5	support without kafka	2015-09-22 17:46:07 +08:00
winlin	abb5c5ad31	add kafka producer	2015-09-22 17:40:05 +08:00
winlin	b5ccc35340	add kafka config	2015-09-22 15:10:43 +08:00
winlin	ab1e62a886	create the metadata request message	2015-09-22 14:33:17 +08:00