1895 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	ccc30c70c4	the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.	2015-02-17 21:01:44 +08:00
winlin	9a7696a7c2	Merge branch '1.0release' of github.com:winlinvip/simple-rtmp-server into 1.0release	2015-02-12 10:41:55 +08:00
winlin	e1e12e5dba	release 1.0r2	2015-02-12 10:19:19 +08:00
winlin	61b0ee55ed	release 1.0r2	2015-02-12 10:18:45 +08:00
winlin	16bf0a1826	dev code HuKaiqun for 1.0.27.	2015-02-12 10:14:30 +08:00
winlin	d07f09aa0b	Update README.md	2015-02-11 12:28:48 +08:00
winlin	b982b27f6f	add dev code for each release. HuKaiqun for SRS1.0	2015-02-11 08:48:22 +08:00
winlin	d5e3ac4e7d	for #310, the aac profile must be object plus one. 1.0.26	2015-02-10 17:15:50 +08:00
winlin	7888506999	update readme for 1.0.25	2015-01-25 13:33:23 +08:00
winlin	9cbc753e8e	for #151, #268, refine the pcr start at 0, dts/pts plus delay. 1.0.25	2015-01-25 13:30:45 +08:00
winlin	b0daf1482d	update version to 1.0.24	2015-01-25 13:10:30 +08:00
winlin	1835957a2b	for #151, refine pcr=dts-800ms and use dts/pts directly. 1.0.24	2015-01-25 13:04:12 +08:00
winlin	4f5cc9c403	for #151, use absolutely overflow to make jwplayer happy. 1.0.23	2015-01-23 15:14:29 +08:00
winlin	4449a8d7b0	fix #290, use iformat only for rtmp input. 1.0.22	2015-01-17 13:04:52 +08:00
winlin	118efcbbf8	update the file for 1.0rc1.	2015-01-15 11:38:03 +08:00
winlin	98fb50464a	update readme for 1.0r1, 1.0.21	2015-01-15 11:31:07 +08:00
winlin	bb74c8dfc5	update readme for 1.0r1	2015-01-15 11:24:00 +08:00
winlin	1316dab83c	update donation link to develop	2015-01-15 09:17:35 +08:00
winlin	b705ed0b90	for bug #288, refine the codec decode info frame failed. 1.0.21	2015-01-14 11:32:19 +08:00
winlin	c80477d58e	update readme.	2015-01-08 19:03:41 +08:00
winlin	27e0521ace	fix #281, fix hls bug ignore type-9 send aud. 1.0.20	2015-01-08 17:37:28 +08:00
winlin	247b772449	hotfix to remove the pageUrl for http callback. 1.0.19	2015-01-03 15:07:12 +08:00
winlin	f9a33fbeee	fix the compile failed for utest at 32bits cpus	2015-01-03 13:29:52 +08:00
winlin	e590537dca	fix #207, trim the last 0 of log. 1.0.18	2015-01-02 12:56:15 +08:00
winlin	ca977ef739	hotfix #216, http-callback post in application/json content-type. 1.0.17	2015-01-02 09:20:45 +08:00
winlin	bb6dfe40c1	fix #270, memory leak for http client post. 1.0.16	2015-01-01 11:44:28 +08:00
winlin	d9aca8ab82	hotfix #267, the forward dest ep should use server. 1.0.15	2014-12-29 09:05:56 +08:00
winlin	513c1ec6d5	fix #268, the hls pcr is negative when startup. 1.0.14	2014-12-29 08:38:29 +08:00
winlin	e77e4cfb8b	hotfix 1.0release, add gitlab remote mirror	2014-12-26 23:06:02 +08:00
winlin	dec4f6b989	hotfix 1.0release, add remote gitlab	2014-12-26 22:45:09 +08:00
winlin	dfd4eeca45	hotfix 1.0release, git checkout develop when commit	2014-12-26 21:49:04 +08:00
winlin	9a66d22f3b	hotfix 1.0release, 1.0.13	2014-12-26 21:43:00 +08:00
winlin	02ec771030	hotfix 1.0release, update the system requirements.	2014-12-26 21:41:08 +08:00
winlin	49daee34b4	hotfix 1.0release, remove the multiple process arch, for 2.0 supports huge connections, and 3.0 will use other arch without st.	2014-12-26 21:39:53 +08:00
winlin	e8b3a0f022	test git, hotfix on 1.0 release branch.	2014-12-26 21:30:09 +08:00
winlin	cefd210c85	test git, hotfix on 1.0 release branch.	2014-12-26 21:30:00 +08:00
winlin	5a0bfd4fe2	test git, hotfix on release 1.0 branch.	2014-12-26 21:25:07 +08:00
winlin	ac11e33ea7	update readme for #264	2014-12-26 12:48:34 +08:00
winlin	2e43a63bf4	fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12	2014-12-22 17:10:51 +08:00
winlin	7737042795	fix #264, remove the test code. 1.0.11	2014-12-20 11:56:16 +08:00
winlin	1dfac0bf1d	fix #264, support disconnect publish connect when hls error. 1.0.11	2014-12-20 11:45:59 +08:00
winlin	d4fb58b175	update donation, refer to nginx http://nginx.org/en/donation.html	2014-12-19 22:02:12 +08:00
winlin	71155fc3d2	update readme for 1.0release	2014-12-07 16:39:22 +08:00
winlin	8aff915538	release SRS 1.0	2014-12-05 18:00:56 +08:00
winlin	9bda56cb42	update readme for bug #239	2014-12-02 15:39:32 +08:00
winlin	24815e4efe	refine code for bug #239	2014-12-02 15:33:22 +08:00
winlin	304208f822	fix #239, traverse the token before response connect. 1.0.10.	2014-12-02 15:27:36 +08:00
winlin	ba3e7c28da	Merge pull request #239 from tufang14/1.0release ... token traverse bug, tranverse token then response the connect request.	2014-12-02 15:24:00 +08:00
tufang14	3d0d43c5dc	token bug ... 多级origin-edge模式，edge上功能不生效	2014-12-02 14:38:54 +08:00
winlin	0c132e9781	update the log position.	2014-11-28 10:58:16 +08:00