1765 commits

Author	SHA1	Message	Date
winlin	75f2607685	fix #211, support security allow/deny publish/play all/ip. 2.0.86	2015-01-02 16:02:13 +08:00
winlin	f8ec7c706d	merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85	2015-01-02 12:57:44 +08:00
winlin	e590537dca	fix #207, trim the last 0 of log. 1.0.18	2015-01-02 12:56:15 +08:00
winlin	07b207b7e3	remove test code for api-server.	2015-01-02 10:30:25 +08:00
winlin	9d34820c80	fix #158: http-callback check http status code ok(200). 2.0.84	2015-01-02 10:21:04 +08:00
winlin	8df0f724d6	fix #216, http-callback post in application/json content-type. 2.0.83	2015-01-02 09:22:49 +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	518a5a72ab	fix #263, srs-librtmp flv read tag should init size. 2.0.82	2015-01-02 09:05:16 +08:00
winlin	c1c01ec802	hotfix #270, memory leak for http client post. 2.0.81	2015-01-01 11:47:18 +08:00
winlin	bb6dfe40c1	fix #270, memory leak for http client post. 1.0.16	2015-01-01 11:44:28 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	1824e18bd2	fix the comment bug.	2014-12-31 20:20:32 +08:00
winlin	12f4abd553	fix #266, aac profile is object id plus one. 2.0.80	2014-12-29 14:24:22 +08:00
winlin	c0a6c3efa3	merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79	2014-12-29 09:07:50 +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	e27c95b0e8	merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78	2014-12-29 08:45:19 +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	5e9ff71740	refine the log verbose	2014-12-28 20:17:27 +08:00
winlin	2d229b09be	refine rtmp protocol stack comments	2014-12-28 15:16:34 +08:00
winlin	5a229e89bf	refine the rtmp protocol stack comments, the stream id in little-endian.	2014-12-28 15:11:55 +08:00
winlin	9e35664510	refine the simple handshake comment.	2014-12-28 12:28:33 +08:00
winlin	8757473a7a	Merge branch '1.0release' into develop	2014-12-26 22:45:22 +08:00
winlin	dec4f6b989	hotfix 1.0release, add remote gitlab	2014-12-26 22:45:09 +08:00
winlin	8ea6da2607	Merge branch '1.0release' into develop	2014-12-26 21:49:22 +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	b8de3bd3b4	convert the core to unix format.	2014-12-25 10:55:12 +08:00
winlin	92146712d8	fix srs-librtmp send raw aac audio channel bug. 2.0.76	2014-12-25 09:52:18 +08:00
winlin	9788570ba5	fix bug for ubuntu14 to build.	2014-12-24 18:32:37 +08:00
winlin	28eedfc177	merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75	2014-12-22 17:12:09 +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	b77e1de1d1	fix bug of utest	2014-12-22 15:31:57 +08:00
winlin	81e70e7bdb	for bug https://github.com/winlinvip/st-load/pull/3, add ecma array to object.	2014-12-21 11:41:15 +08:00
winlin	eef8034632	merge from 1.0release for bug #264. 2.0.74	2014-12-20 11:58:39 +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	db13c725a6	refine #259, rename the on_dispose to wakeup. 2.0.73	2014-12-19 09:19:47 +08:00
winlin	61a648f1d2	refine for #259, chmod -x files.	2014-12-19 09:07:31 +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
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
winlin	127b96b255	add git2unix and git commit script.	2014-11-28 10:42:47 +08:00
winlin	9c033c7da6	hotfix 1.0, author bug, use error macro. 1.0.9	2014-11-27 18:48:01 +08:00
winlin	575e50b6e2	hotfix to add comments on 1.0release	2014-11-27 17:47:13 +08:00
winlin	be53b10ed3	refine log position	2014-11-27 08:04:39 +08:00
winlin	d91a9dfa9d	udpate the srs_bwt.	2014-11-25 11:10:54 +08:00
winlin	cd0ab5fb43	update PRIMARY, AUTHORS, CONTRIBUTORS rule	2014-11-25 10:50:59 +08:00
winlin	db7af6259a	update PRIMARY, AUTHORS, CONTRIBUTORS rule	2014-11-25 10:50:25 +08:00
winlin	d672fae255	update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8	2014-11-25 10:07:41 +08:00