4471 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	1e7c12a6dd	For #910, Support HTTP FLV with HTTP callback. 2.0.254	2018-08-11 19:09:56 +08:00
winlin	928c6ab091	For #1181, Add utest	2018-08-11 13:16:59 +08:00
winlin	01d8bba455	For #1181, Refine code to write utest	2018-08-11 12:33:03 +08:00
winlin	c582590bb0	For #1110, Refine params in http callback. 2.0.253	2018-08-11 10:15:14 +08:00
winlin	6cea551c64	For #1110, Refine params in http callback. 2.0.253	2018-08-11 10:12:40 +08:00
winlin	0e1ddb046d	Update readme for FLV realtime	2018-08-05 20:35:33 +08:00
winlin	33f6e9a21f	Update readme for FLV realtime	2018-08-05 20:33:45 +08:00
winlin	d607c7f905	Refine HTTP-FLV latency, support realtime mode.3.0.38	2018-08-05 20:30:04 +08:00
winlin	03ac48f8fa	Merge 2.0, for FLV latency	2018-08-05 20:25:28 +08:00
winlin	c45f72ef7b	Refine HTTP-FLV latency, support realtime mode. 2.0.252	2018-08-05 20:23:17 +08:00
winlin	580c94c8c0	Refine code	2018-08-05 18:58:23 +08:00
winlin	31945c244d	For #1110, Refine code.	2018-08-05 11:09:48 +08:00
winlin	455a060fa5	Merge 2.0	2018-08-05 10:52:37 +08:00
winlin	ee43fc92ae	For #1110, Refine conf	2018-08-05 10:47:01 +08:00
winlin	ae99131512	Fix #1087, Ignore iface without address. 3.0.37	2018-08-05 10:41:31 +08:00
winlin	82699ff616	Refine code for librtmp	2018-08-05 10:39:52 +08:00
winlin	29b74c7220	For #1110, Support params in http callback. 3.0.36	2018-08-04 19:51:04 +08:00
winlin	85d3a5001c	For #1110, Support params in http callback. 2.0.251	2018-08-04 19:36:42 +08:00
winlin	68a1656e07	Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35	2018-08-02 09:17:49 +08:00
winlin	8cf5df5afb	Merge 2.0release	2018-08-02 07:25:16 +08:00
winlin	09dbda5b18	For #1031, SRS forwarder support douyu.com.	2018-08-02 07:24:08 +08:00
winlin	a66d450ec1	For #1031, SRS edge support douyu.com. 3.0.34	2018-08-02 07:14:06 +08:00
winlin	586899a010	For #1031, SRS edge support douyu.com. 2.0.250	2018-08-02 06:59:57 +08:00
winlin	41c6e833b9	Replace hex to string to match MIT license. 3.0.33	2018-07-22 18:47:38 +08:00
winlin	84f81983aa	Replace base64 to match MIT license. 3.0.32	2018-07-22 17:56:38 +08:00
winlin	0a63448b86	Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31	2018-07-22 15:21:05 +08:00
winlin	e395878916	Replace crc32 IEEE by golang to match MIT license. 3.0.30	2018-07-21 20:58:20 +08:00
winlin	dea5e5bb48	Add utest or CRC32 IEEE, refine TABs of code	2018-07-21 19:09:32 +08:00
winlin	608c88b8f2	Merge 2.0release	2018-07-21 17:52:12 +08:00
winlin	6d7c7418a8	Merge #1119, fix memory leak. 2.0.249	2018-07-21 17:49:46 +08:00
winlin	551863a7ed	Refine code	2018-07-21 17:34:31 +08:00
winlin	f5c4d5a539	Release 2.0r3, SRS/2.0.248	2018-07-18 20:31:03 +08:00
winlin	5952671689	Release 2.0r3, SRS/2.0.248	2018-07-18 20:27:54 +08:00
winlin	693194dffe	Merge 2.0release	2018-07-18 19:26:53 +08:00
winlin	d27db215df	For #1176, should not close fd when success.	2018-07-18 19:21:29 +08:00
winlin	e4742ddac7	Merge 2.0release	2018-07-17 13:59:51 +08:00
winlin	2d49b9d1a7	Merge #1176, fix scaned issues. 2.0.248	2018-07-17 13:44:01 +08:00
winlin	dc6b329be3	Merge pull request #1176 from fastfading/2.0release ... fix security scan report issue #1172 #1173 #1174 #1175	2018-07-17 13:32:59 +08:00
Hui Zhang (huzhang2)	01ed485cf3	fix #1172 #1173 #1174 #1175 ... security scan report issue	2018-07-17 10:03:13 +08:00
Harlan	e9cb8210fc	fix default value error	2018-05-15 11:20:52 +08:00
Harlan	90f70d4cd3	CI test	2018-04-06 10:57:46 +08:00
Harlan	45a57acbb4	fix bug	2018-04-06 10:05:13 +08:00
Harlan	43ebd5958d	fix bug that only one stream can be encrypted..	2018-04-03 22:00:32 +08:00
winlin	dba44c7c3f	Merge branch 'develop' into 3.0release	2018-03-25 20:00:33 +08:00
xialixin	bb4e16ae3c	fix create dir success result check (#1080)	2018-03-25 17:48:07 +08:00
xialixin	aaf2905a9d	add: hls configuration adds [duration] variable (#1083)	2018-03-25 17:47:37 +08:00
Harlan	52596a0b04	add HLS encryption feature	2018-03-25 12:05:52 +08:00
winlin	0d78b908a7	Fix client tools resolve dns failed bug	2018-03-20 19:50:46 +08:00
winlin	c20b819a29	Refine readme	2018-03-03 10:04:21 +08:00
winlin	449c632e49	For #464: Add example for origin cluster	2018-03-03 10:01:01 +08:00