3642 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	d2ccc4f661	Merge branch '2.0release' into develop	2015-11-10 12:15:00 +08:00
winlin	1c944ed451	Merge pull request #522 from ossrs/hotfix/commit ... use /usr/local/bin for osx.	2015-11-10 12:12:00 +08:00
winlin	8c04b17d08	use /usr/local/bin for osx.	2015-11-10 12:03:52 +08:00
winlin	7db7d43aea	Merge branch '2.0release' into develop	2015-11-09 15:25:55 +08:00
winlin	18b50d961f	support query server by id.	2015-11-09 15:19:50 +08:00
winlin	aca9fe805c	Merge branch '2.0release' into develop	2015-11-09 14:51:47 +08:00
winlin	d916c53702	refine the api server.	2015-11-09 14:51:41 +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	75be18133d	fix build failed for utest.	2015-11-06 10:26:18 +08:00
winlin	6df4d1f05a	merge from srs2.	2015-11-05 15:12:49 +08:00
winlin	98e25def6c	fix utest build failed for osx.	2015-11-05 15:11:59 +08:00
winlin	97f5bb8b99	merge from srs2	2015-11-05 14:48:25 +08:00
zhengfl	38b81ce312	允许操作SrsStream中的函数时，长度为0.	2015-11-05 14:37:21 +08:00
zhengfl	1dae8fc987	fix #511, fix the bug of thread stop invalid.	2015-11-05 13:52:59 +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	302be41d00	merge from srs2.0.198	2015-11-02 13:49:27 +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	4b5eb5ea2d	fix the parse rtmp url bug for ingest.	2015-11-02 13:37:44 +08:00
winlin	e3407c1dd2	merge from srs2.	2015-11-02 11:49:23 +08:00
winlin	ec225b2108	quit child process when fork failed.	2015-11-02 11:46:33 +08:00
winlin	9d7826c681	quit child process when fork failed.	2015-11-02 11:44:22 +08:00
winlin	f57e537686	for #515, merge from srs2, use SrsAutoFreeA.	2015-11-02 11:29:20 +08:00
winlin	f4f76cd196	for #515, use SrsAutoFreeA to free the array.	2015-11-02 11:26:37 +08:00
winlin	604486b0a3	for #515, use srs_freepa to free array.	2015-11-02 11:11:49 +08:00
winlin	8cec06e898	merge srs2, use srs_freepa for array	2015-11-02 11:05:39 +08:00
winlin	2af7749771	for #515, use srs_freepa to free the array.	2015-11-02 11:02:27 +08:00
winlin	cef1ae5a8e	fix the config bug.	2015-10-28 12:55:16 +08:00
winlin	9ebb77d711	fix the warnings	2015-10-28 11:58:49 +08:00
winlin	e9e202dbf1	merge srs2	2015-10-28 11:51:32 +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	59f5c5d6a5	Merge branch '2.0release' into develop	2015-10-27 18:21:04 +08:00
winlin	3b0bf1e10b	for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok.	2015-10-27 18:20:57 +08:00
winlin	390f58e186	fix compile failed.	2015-10-27 17:57:58 +08:00
winlin	a416e891b4	fix compile failed.	2015-10-27 17:54:07 +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	fe27e76492	support schema	2015-10-26 18:34:55 +08:00
winlin	a501f5bd7a	update htbt script	2015-10-26 14:54:41 +08:00
winlin	dd2945add1	update htbt script	2015-10-26 14:53:54 +08:00
winlin	6f6d495a19	update htbt script	2015-10-26 14:50:16 +08:00
winlin	3933819686	add htbt script	2015-10-26 14:18:19 +08:00
winlin	0a8cb8a391	add heartbeat script	2015-10-26 14:17:24 +08:00
winlin	11979229e6	Merge branch '2.0release' into develop	2015-10-26 13:34:44 +08:00