1326 commits

Author	SHA1	Message	Date
winlin	e2865c6ac1	workaround for #511, the fly stfd in close. 2.0.211	2016-09-01 16:51:09 +08:00
winlin	b49cb3d379	Merge branch '2.0release' into develop	2016-08-30 19:30:05 +08:00
winlin	a0890fe06a	comment the pcr	2016-08-30 19:29:59 +08:00
winlin	bf22acd689	Merge branch '2.0release' into develop	2016-08-18 11:29:22 +08:00
winlin	f080537887	update readme	2016-08-18 11:28:54 +08:00
winlin	7df7156e07	Merge branch '2.0release' into develop	2016-08-17 10:12:34 +08:00
winlin	dbc6d94028	update readme.	2016-08-17 09:33:11 +08:00
winlin	abeb4f46a9	merge 2.0	2016-08-06 17:28:43 +08:00
winlin	007f7da50b	release 2.0beta0, 2.0.10	2016-08-06 16:44:33 +08:00
winlin	ceb0187bd1	update readme	2016-05-17 10:58:09 +08:00
winlin	768cbd3a1a	refine readme	2016-01-20 14:21:00 +08:00
winlin	6c80ecbbf9	update readme	2016-01-20 14:19:53 +08:00
winlin	27690f9e52	Merge branch '2.0release' into develop	2016-01-13 17:31:40 +08:00
winlin	b51cd599cc	add linked in page.	2016-01-13 17:31:33 +08:00
winlin	28080efec8	fix http reader bug, support infinite chunkted. 2.0.209	2016-01-13 12:44:51 +08:00
winlin	a11ab5ad24	merge from srs2.	2016-01-11 13:22:45 +08:00
winlin	e2e6e76f92	for #558 and #559, 2.0.208	2016-01-11 13:21:28 +08:00
winlin	8155e97b84	add keyword XCORE for coredump to identify the version. 2.0.207	2016-01-05 16:49:27 +08:00
winlin	384de15094	merge srs2	2015-12-23 10:18:18 +08:00
winlin	d3139c52cc	release 2.0.205, 2.0-alpha3.	2015-12-23 09:58:17 +08:00
winlin	714c13d88d	merge from srs2	2015-12-22 19:19:28 +08:00
winlin	5d3a183f43	fix #509, always alloc big object at heap. 2.0.205	2015-12-22 19:18:46 +08:00
winlin	65b81a4e68	merge from srs2	2015-12-22 17:01:06 +08:00
winlin	8b24319ffb	fix #418, ignore null connect props to make RED5 happy. 2.0.204	2015-12-22 17:00:22 +08:00
winlin	b881166f9a	merge from srs2	2015-12-22 16:18:09 +08:00
winlin	c7850570c1	fix #546, thread terminate normally dispose bug. 2.0.203	2015-12-22 16:13:49 +08:00
winlin	5f915aa959	merge from srs2	2015-12-22 15:40:03 +08:00
winlin	cee8c3d07d	fix #541, failed when chunk size too small. 2.0.202	2015-12-22 15:39:12 +08:00
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	2015-12-15 16:02:02 +08:00
winlin	cafe886c3f	merge srs2	2015-11-27 17:46:00 +08:00
winlin	34d1ce9922	update readme, add gitter.	2015-11-27 17:45:04 +08:00
winlin	18eb8c81b3	merge from srs2	2015-11-16 18:10:06 +08:00
winlin	2310b2da59	fix #518, fix fd leak bug when fork. 2.0.200	2015-11-16 18:06:44 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
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