1346 commits

Author	SHA1	Message	Date
winlin	f73a17eac3	Merge branch 3.0release into develop	2019-04-06 16:11:18 +08:00
winlin	f2b4bc7110	Fix #1304, Fix ST coroutine pull error. 3.0.47	2019-04-06 16:10:33 +08:00
winlin	128dc67776	Merge branch 3.0release into develop	2019-04-06 15:42:39 +08:00
winlin	23a2d8eefd	Support HTTP-FLV params. 3.0.46	2019-04-06 15:42:24 +08:00
winlin	a8781aee3e	For #1304, Default HSTRS to on. 2.0.264	2019-04-06 15:35:12 +08:00
winlin	ffe4ac654d	Update readme	2019-04-05 20:13:02 +08:00
winlin	6e6e996bba	Release 2.0.263	2019-04-05 20:09:23 +08:00
winlin	a554dd85e1	Fix GCC7 build error, this statement may fall through. 2.0.263	2019-04-05 19:54:32 +08:00
winlin	85db08cef9	Merge branch 3.0release into develop	2019-04-05 18:49:34 +08:00
winlin	b9750baa52	For #1339, Support HTTP-FLV params.	2019-04-05 18:44:50 +08:00
winlin	91c462b6ba	For #1339, Support HTTP-FLV params. 2.0.262	2019-04-05 18:16:05 +08:00
winlin	75b3ca9456	Update readme	2019-02-11 11:35:00 +08:00
winlin	d5ea3c39b3	Update readme	2019-02-11 11:30:10 +08:00
winlin	84438b5c0f	Update readme	2019-02-11 11:22:35 +08:00
winlin	9f10f890cf	Merge 3.0release	2019-02-11 11:12:39 +08:00
winlin	663a003fa5	Update reamde	2019-02-07 21:06:25 +08:00
Keegan H	eeffb6d3ff	Update README.md (#1317)	2019-02-07 21:01:14 +08:00
winlin	c646e3f287	CI: Research support codecov	2019-02-03 09:27:08 +08:00
winlin	19f1bf4e27	Update Readme	2019-02-02 21:54:11 +08:00
winlin	a25efa3764	CI: Update codecov badge	2019-02-02 21:51:08 +08:00
winlin	408c2d05ed	CI: Update badges	2019-02-02 20:22:49 +08:00
winlin	3e8f070635	CI: Update badges	2019-02-02 20:17:57 +08:00
winlin	15f75ffb22	CI: Update badges	2019-02-02 20:13:26 +08:00
winlin	1e87623a70	CI: Update badges	2019-02-02 20:08:49 +08:00
winlin	abfc35c6c7	Update readme	2019-01-01 13:41:18 +08:00
winlin	7ee3dad2f9	Update readme	2018-12-16 23:39:45 +08:00
winlin	432a575c7a	Use docker for #1274 and #1250	2018-12-10 00:07:38 +08:00
winlin	b0e91e8fe9	Use docker for #1274 and #1250	2018-12-10 00:05:23 +08:00
winlin	a8be5f8f27	Allow OSX for utest	2018-12-09 19:41:59 +08:00
winlin	f1033296bb	Upgrade to FFMPEG 4.1 and X264 157. 2.0.261	2018-12-01 20:21:35 +08:00
winlin	24f46f5085	#1261, Support _definst_ for Wowza. 3.0.44	2018-11-11 13:51:10 +08:00
winlin	99aa249f3a	#1261, Support _definst_ for Wowza. 2.0.260	2018-11-11 13:33:47 +08:00
winlin	b2066cbf68	#1263, Fix string trim bug. 2.0.259	2018-11-11 13:30:12 +08:00
winlin	39f1629168	Merge from SRS2	2018-10-28 14:24:18 +08:00
winlin	4cb8de3029	Release r2.0r5, 2.0.258	2018-10-28 14:18:36 +08:00
winlin	58e501ee24	Fix #1250, Support build on OSX10.14 Mojave. 2.0.258	2018-10-28 14:09:55 +08:00
winlin	63ac93a642	Merge #1236 from 2.0release	2018-10-08 07:22:21 +08:00
winlin	a5b452f965	Merge #1236, Fix sleep bug in us. 2.0.257	2018-10-08 07:16:07 +08:00
winlin	3f009937ee	Merge #1237 from 2.0release	2018-10-08 07:10:29 +08:00
winlin	9859fa9e6f	Merge #1237, Support param for transcoder. 2.0.256	2018-10-08 07:09:31 +08:00
winlin	580b94c9c8	SRS console support both Chinese and English	2018-08-26 19:38:46 +08:00
winlin	5945fb5a24	Fix #1093, Support HLS encryption. 3.0.42	2018-08-25 21:17:33 +08:00
winlin	e73e30de3a	Fix #1051, Drop ts when republishing stream. 3.0.41	2018-08-25 18:10:55 +08:00
winlin	a61bfb2066	Merge 2.0r4	2018-08-12 12:09:18 +08:00
winlin	36cebc4b71	Release 2.0r4, 2.0.255	2018-08-12 12:03:31 +08:00
winlin	728ddd133b	For #1202, Support edge/forward to Aliyun CDN. 3.0.40	2018-08-12 10:46:06 +08:00
winlin	74a87d54f2	For #1202, Support edge/forward to Aliyun CDN. 2.0.255	2018-08-12 10:44:55 +08:00
winlin	1cc72df134	Fix #910, Support HTTP FLV with HTTP callback. 3.0.39	2018-08-11 19:23:51 +08:00
winlin	1e7c12a6dd	For #910, Support HTTP FLV with HTTP callback. 2.0.254	2018-08-11 19:09:56 +08:00
winlin	c582590bb0	For #1110, Refine params in http callback. 2.0.253	2018-08-11 10:15:14 +08:00