1092 commits

Author	SHA1	Message	Date
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	a3a6282fe9	merge srs2.	2015-11-06 10:52:29 +08:00
winlin	a89ed68aa3	update readme for #511.	2015-11-06 10:51:32 +08:00
winlin	6e3eb50b78	Merge branch '2.0release' into develop	2015-11-02 13:51:07 +08:00
winlin	6d0adb9f22	fix typo	2015-11-02 13:51:01 +08:00
winlin	57536bf428	fix typo in readme.	2015-11-02 13:47:56 +08:00
winlin	2b21a63d8f	merge from srs2.	2015-11-02 13:43:22 +08:00
winlin	49d77b3f09	for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198	2015-11-02 13:42:05 +08:00
winlin	ef00005ab4	for ExoPlayer, remove duration for live.	2015-10-28 11:51:03 +08:00
winlin	8c96472cea	merge srs2	2015-10-28 11:03:15 +08:00
winlin	50a7b9c1ff	for ExoPlayer, add av tag in flv header. 2.0.197	2015-10-28 11:01:20 +08:00
winlin	1d57e53910	merge from 2.0release	2015-10-27 17:45:14 +08:00
winlin	d1979c760f	for #512, partical hotfix the hls pure audio. 2.0.196	2015-10-27 17:44:10 +08:00
winlin	3683f06e4d	for #512, write audio frame by frame for video+audio hls.	2015-10-27 16:20:02 +08:00
winlin	9a47390253	fix #467, support write log to kafka. 3.0.6	2015-10-23 14:42:04 +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	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	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	d94a88a797	merge from srs2 for pi and cubie.	2015-09-23 11:23:55 +08:00
winlin	6990508e58	for #485, srs for respberrypi and cubieboard. 2.0.191	2015-09-23 11:05:56 +08:00
winlin	874ae85e47	update readme.	2015-09-21 14:26:31 +08:00
winlin	22d6ec4f93	update readme.	2015-09-21 14:24:06 +08:00
winlin	841d9ee5ad	update readme.	2015-09-21 14:20:30 +08:00
winlin	f07d7dcf35	update readme.	2015-09-21 14:19:07 +08:00
winlin	ddb0dcdcaa	update readme.	2015-09-21 14:13:07 +08:00
winlin	99e27c035a	update readme.	2015-09-21 13:52:16 +08:00
winlin	0fb353f1f6	update readme.	2015-09-21 13:50:01 +08:00
winlin	e5581981d4	Merge branch '2.0release' into develop	2015-09-21 13:39:15 +08:00
winlin	534a8c9fa3	update readme.	2015-09-21 13:39:08 +08:00
winlin	bbbb4e5025	update readme.	2015-09-21 13:37:42 +08:00
winlin	e5429fef02	update readme.	2015-09-21 13:34:28 +08:00
winlin	a6377fe456	refine readme	2015-09-21 13:26:08 +08:00
winlin	533b9a5cfb	Merge branch '2.0release' into develop	2015-09-21 13:24:34 +08:00
winlin	87d007d087	refine readme	2015-09-21 13:24:29 +08:00
winlin	f42cd55078	refine readme	2015-09-21 13:24:05 +08:00
winlin	2d99e8a563	refine readme	2015-09-21 13:20:04 +08:00
winlin	d129c1079b	refine readme	2015-09-21 13:19:32 +08:00
winlin	21fa01d706	refine readme	2015-09-21 13:19:06 +08:00
winlin	03c2884f8c	refine readme	2015-09-21 13:17:54 +08:00
winlin	c90e117bbf	refine readme	2015-09-21 12:41:45 +08:00
winlin	d98fc58e8b	refine readme	2015-09-21 12:32:14 +08:00
winlin	e4e36a0166	merge from srs2, fix openssl build	2015-09-21 12:03:47 +08:00
winlin	d8a64aaab5	fix #484, hotfix the openssl build script 2.0.190	2015-09-21 12:01:48 +08:00
winlin	b59d9ba6a1	support amf0 and json to convert with each other.	2015-09-19 13:31:57 +08:00
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