985 commits

Author	SHA1	Message	Date
winlin	3f7e69b617	json objects support dumps to string.	2015-09-19 12:27:31 +08:00
winlin	8a90e76637	fix #459, support dvr raw api. 3.0.4	2015-09-15 23:00:00 +08:00
winlin	2a1b2b69a0	for #459, dvr support apply filter for ng-control dvr module.	2015-09-15 15:58:57 +08:00
winlin	8f9cfcdcf4	fix #319, http raw api support update global and vhost. 3.0.4	2015-09-15 13:03:18 +08:00
winlin	95979674f9	merge srs 2	2015-09-14 21:09:34 +08:00
winlin	2c21f74efb	update readme.	2015-09-14 21:08:19 +08:00
winlin	a865eb9ccb	merge from srs2	2015-09-14 20:58:54 +08:00
winlin	1d477ae71b	srs 2.0 alpha1 released. 89269 lines.	2015-09-14 20:48:32 +08:00
winlin	a7c4b786cf	merge from 2.0	2015-09-14 18:42:31 +08:00
winlin	511627abab	fix #474, config to donot parse width/height from sps. 2.0.189	2015-09-14 18:36:44 +08:00
winlin	a994191ddc	for #474, always release publish for source.	2015-09-14 15:10:34 +08:00
winlin	eb9aa47ab1	merge from 2.0	2015-09-14 13:48:27 +08:00
winlin	0d57ef9373	fix #458, http hooks use source thread cid. 2.0.188	2015-09-14 13:47:25 +08:00
winlin	3b483094bd	merge from 2.0	2015-09-14 12:24:57 +08:00
winlin	6d50aa1aa2	#475, fix http hooks crash for st context switch. 2.0.187	2015-09-14 12:22:19 +08:00
winlin	ad6de898a5	Merge branch '2.0release' into develop	2015-09-14 09:29:09 +08:00
winlin	d07bfa459a	update donation	2015-09-14 09:28:47 +08:00
winlin	1518ea6142	update donation	2015-09-13 18:15:51 +08:00
winlin	589d430086	Update README.md	2015-09-13 18:14:56 +08:00
winlin	61d817bad5	Update README.md	2015-09-13 18:07:26 +08:00
winlin	f9228464b6	update donation	2015-09-13 17:59:37 +08:00
winlin	f09019ea0d	update donation	2015-09-13 17:57:40 +08:00
winlin	77d21f7e32	refine readme, fix typo	2015-09-11 08:02:45 +08:00
winlin	6931bdd6d5	refine readme, the module and arch	2015-09-11 08:00:16 +08:00
winlin	d76eda35ab	refine readme, add exec for stream arch	2015-09-11 07:47:40 +08:00
winlin	a0c6e4ee8c	refine readme, add exec for stream arch	2015-09-11 07:47:08 +08:00
winlin	9d85025114	Update README.md	2015-09-11 07:38:58 +08:00
winlin	db1ed513be	Update README.md	2015-09-11 07:37:57 +08:00
winlin	d56b9fd90f	refine readme	2015-09-11 07:35:42 +08:00
winlin	abd7ee227c	support reload utc_time. 2.0.186	2015-09-09 23:37:07 +08:00
winlin	11c409688b	for #319, http raw api support query. 3.0.3	2015-08-31 23:34:03 +08:00
winlin	5efd1912f2	refine readme	2015-08-28 22:21:18 +08:00
winlin	871ac95c2e	merge from srs 2	2015-08-28 18:49:41 +08:00
winlin	0221434ae9	refine links	2015-08-28 18:48:35 +08:00
winlin	166e487d24	refine links	2015-08-28 18:47:39 +08:00
winlin	f3b4f2bc53	refine readme for links	2015-08-28 18:29:46 +08:00
winlin	7f2bbcb248	refine readme links.	2015-08-28 18:26:25 +08:00
winlin	c290951d20	merge from srs2	2015-08-28 18:18:49 +08:00
winlin	cf48559752	refine the readme.	2015-08-28 18:17:56 +08:00
winlin	1b1a2a1e63	fix #471, api response the width and height. 3.0.2	2015-08-28 18:00:24 +08:00
winlin	c34b0c86e1	fix #367, support nginx-rtmp exec. 3.0.1	2015-08-25 22:29:00 +08:00
winlin	5e48dab2b9	Merge branch '2.0release' into develop	2015-08-23 09:57:07 +08:00
winlin	21b175b4db	add remote console to feature list.	2015-08-23 09:57:04 +08:00
winlin	ce1627eb34	Merge branch '2.0release' into develop	2015-08-23 09:55:46 +08:00
winlin	899ecb5661	add remote console to feature list.	2015-08-23 09:55:41 +08:00
winlin	8d2b2d0148	Merge branch '2.0release' into develop	2015-08-23 09:39:23 +08:00
winlin	ada33bdad7	add srs 1.0release time	2015-08-23 09:39:16 +08:00
winlin	b4040a5fc9	Merge branch '2.0release' into develop	2015-08-23 09:11:38 +08:00
winlin	724498bb09	update 2.0 release file to srs2.0a0	2015-08-23 09:11:32 +08:00
winlin	7e475e15b0	release 2.0a0	2015-08-23 09:00:57 +08:00