1224 commits

Author	SHA1	Message	Date
winlin	c4966484e1	For #893, #899, merge SRS2	2017-05-29 12:17:16 +08:00
winlin	e8cb2e6be4	Merge #899 to fix #893, ts PES ext length. 2.0.243	2017-05-29 12:15:04 +08:00
winlin	f97260be1d	Merge SRS2	2017-05-01 16:44:14 +08:00
winlin	a613eb78c6	Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242	2017-05-01 16:39:59 +08:00
winlin	ae5450181c	Fix #636, FD leak for requesting empty HTTP stream. 2.0.241	2017-04-30 12:03:31 +08:00
winlin	c97f2233a2	Merge SRS2 for #851	2017-04-23 21:00:06 +08:00
winlin	ff87318b95	Fix #851, HTTP API support number of video frames for FPS. 2.0.240	2017-04-23 20:55:51 +08:00
winlin	d0bf47906d	Merge SRS2	2017-04-18 21:11:36 +08:00
winlin	4167715153	Release 2.0r1, 2.0.239	2017-04-18 21:08:31 +08:00
winlin	d15c21a034	Merge branch '2.0release' into develop	2017-04-18 11:51:25 +08:00
winlin	f2dd866c78	Fix typo of Readme.	2017-04-18 11:51:19 +08:00
winlin	9a2a6ab95f	Merge SRS2	2017-04-18 11:42:11 +08:00
winlin	5e284b58a4	Fix #848, crash at HTTP fast buffer grow 2.0.239	2017-04-18 11:41:09 +08:00
winlin	a98c9e04e3	Fix #547, support HLS audio in TS. 3.0.22	2017-04-16 21:33:39 +08:00
winlin	1054b0a90f	Merge SRS2	2017-04-15 20:46:00 +08:00
winlin	33a0abdeff	Fix #844, support Haivision encoder. 2.0.238	2017-04-15 20:44:02 +08:00
winlin	d6e28bde69	Merge from SRS2.	2017-04-15 17:09:50 +08:00
winlin	1c139d8fd8	Merge #846, fix fd leak for FLV stream caster. 2.0.237	2017-04-15 16:59:36 +08:00
winlin	8d35585c13	Merge #841, avoid the duplicated sps/pps in ts. 2.0.236	2017-04-15 16:54:42 +08:00
winlin	5fed19941d	Update links for compare	2017-04-12 10:39:20 +08:00
winlin	33375db401	Merge from SRS2, for #834	2017-04-09 18:52:21 +08:00
winlin	b11ddc7f41	Fix #834, crash for TS context corrupt. 2.0.235	2017-04-09 18:45:42 +08:00
winlin	609605a50b	Fix #820, extract service for modules. 3.0.21	2017-03-26 17:05:50 +08:00
winlin	b4b5fb77f3	Add skype for English user.	2017-03-26 14:33:55 +08:00
winlin	7d1a91ca7d	Add skype for English user.	2017-03-26 14:32:46 +08:00
winlin	b83be2f29c	Add skype for English user.	2017-03-26 14:32:05 +08:00
winlin	4ccb17ddfb	Add skype for English user.	2017-03-26 14:31:44 +08:00
winlin	19632e5b4b	Add skype for English user.	2017-03-26 14:31:17 +08:00
winlin	004381b7c9	Add skype for English user.	2017-03-26 14:28:53 +08:00
winlin	ff822b55cd	For #820, extract service module.	2017-03-26 10:16:21 +08:00
winlin	8a53128a37	Merge SRS2	2017-03-02 21:55:52 +08:00
winlin	795c94a92f	Release v2.0r0, 2.0.234	2017-03-02 21:41:15 +08:00
winlin	dee17df83e	Release 2.0r0, 2.0.234	2017-03-02 21:02:25 +08:00
winlin	308c6fee18	Fix #786, simply don't reuse object. 3.0.20	2017-03-02 16:43:06 +08:00
winlin	121a2e5886	For #110, refine thread object. 3.0.19	2017-03-01 12:28:32 +08:00
winlin	e754ab7073	Update readme for Kafka, DVR MP4 and compare	2017-02-26 09:24:46 +08:00
winlin	bd84e476e6	For #730, remove the test code. 2.0.234	2017-02-25 20:24:56 +08:00
winlin	3903d2a8e3	For #730, remove the test code. 2.0.234	2017-02-25 20:24:18 +08:00
winlin	2a4f57a587	Fix #301, User must config the codec in right way for HLS. 3.0.18	2017-02-12 20:55:35 +08:00
winlin	b0789c54e4	Update HLS wiki to v3	2017-02-11 14:28:40 +08:00
winlin	292f62ab0f	Update the wiki links	2017-02-11 14:13:55 +08:00
winlin	fdd81fa886	Update index	2017-02-11 14:03:13 +08:00
winlin	af0d98619a	Merge srs2	2017-02-11 13:55:45 +08:00
winlin	1cf24905ce	Update 2.0 wikis	2017-02-11 13:54:17 +08:00
winlin	ebc1be913f	Merge branch '2.0release' into develop	2017-02-10 13:15:51 +08:00
winlin	605192f448	add wechat link	2017-02-10 13:14:29 +08:00
winlin	72ceeaf2ff	Merge branch '2.0release' into develop	2017-02-10 12:54:55 +08:00
winlin	8d60318378	add wechat link	2017-02-10 12:54:04 +08:00
winlin	dd1929c7a1	add wechat link	2017-02-10 12:49:06 +08:00
winlin	e2d85d099e	update readme for DVR mp4	2017-02-09 15:43:40 +08:00