5136 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	bf45d8e23b	Merge branch '3.0release' into develop	2020-02-16 14:11:42 +08:00
winlin	304b92cc36	Update maintainers	2020-02-16 13:41:47 +08:00
winlin	8079564077	Update maintainers	2020-02-16 13:39:25 +08:00
winlin	0723b36f0e	Merge branch '3.0release' into develop	2020-02-16 13:31:54 +08:00
winlin	1604fcf35a	Update authors	2020-02-16 13:31:03 +08:00
winlin	16173194b9	Release 3.0-beta1, r3.0b1, 3.0.117	2020-02-14 23:05:54 +08:00
winlin	131acf5bb0	For #1595, migrating streaming from ossrs.net to r.ossrs.net. 3.0.117	2020-02-14 23:04:01 +08:00
winlin	4276bea463	Migrating streaming service from ossrs.net to r.ossrs.net	2020-02-14 22:00:58 +08:00
winlin	23324cde31	Migrating streaming service from ossrs.net to r.ossrs.net	2020-02-14 21:57:02 +08:00
winlin	21c2cb6512	Update issue template	2020-02-14 11:17:19 +08:00
winlin	51d6c367f5	Merge remote-tracking branch 'runner365/3.0release' into develop	2020-02-13 17:05:18 +08:00
Alex.CR	ce4123f250	rtmp tcp listen port bugs in srt2rtmp (#1602) ... * update srt2rtmp about rtmp listen tcp port * update srt2rtmp about rtmp listen tcp port	2020-02-13 17:02:54 +08:00
runner365	94741c1676	update srt2rtmp about rtmp listen tcp port	2020-02-13 16:58:35 +08:00
runner365	76204fa2ba	Merge remote-tracking branch 'srs/develop' into 3.0release	2020-02-13 16:52:47 +08:00
runner365	8e40f9cf22	update srt2rtmp about rtmp listen tcp port	2020-02-13 16:52:26 +08:00
winlin	8b7fbac7d4	SRT supports detail config for DynamicConfig. 4.0.4	2020-02-13 12:17:09 +08:00
winlin	37fdecba3c	Merge remote-tracking branch 'runner365/3.0release' into develop	2020-02-13 11:06:19 +08:00
Alex.CR	9dad53691e	solve latency parameter error (#1600) ... * solve latency parameter error	2020-02-13 10:54:24 +08:00
runner365	ca1efc6a34	solve merge problem	2020-02-13 10:25:13 +08:00
runner365	d8419bd4dd	solve latency parameter error	2020-02-13 09:58:14 +08:00
Alex.CR	5f7d23f123	add srt parameter configure (#1599) ... * if there isn't srt connect, it needn't epoll wait * solve repush srt bugs * change two thread to one thread * mpegts discard header is not 0x47 * add srt_epoll_clear_usocks * add srt parameter configure	2020-02-12 21:03:26 +08:00
runner365	24f286684e	add srt parameter configure	2020-02-12 20:02:55 +08:00
Alex.CR	c2012379af	change srt epoll thread to one thread (#1597) ... * if there isn't srt connect, it needn't epoll wait * solve repush srt bugs * change two thread to one thread * mpegts discard header is not 0x47 * add srt_epoll_clear_usocks	2020-02-12 10:23:39 +08:00
runner365	6f4c124f58	solve merge confict	2020-02-12 10:19:30 +08:00
runner365	1a1d0e9267	add srt_epoll_clear_usocks	2020-02-12 09:54:07 +08:00
runner365	548c918efb	mpegts discard header is not 0x47	2020-02-11 21:36:36 +08:00
runner365	4fdf242e99	change two thread to one thread	2020-02-11 20:37:42 +08:00
winlin	d2a071f041	Add TODO for incompatible APIs of librtmp	2020-02-11 19:32:46 +08:00
Alex.CR	3847807534	solve srt repush bugs (#1596) ... * if there isn't srt connect, it needn't epoll wait * solve repush srt bugs	2020-02-09 11:50:58 +08:00
runner365	1c6203bda2	solve repush srt bugs	2020-02-09 11:09:48 +08:00
runner365	1941f55475	if there isn't srt connect, it needn't epoll wait	2020-02-05 21:21:12 +08:00
winlin	bdc7973596	Merge branch '3.0release' into develop	2020-02-05 14:18:07 +08:00
winlin	fc769550db	Fix #665, fix HTTP-FLV reloading bug. 3.0.116	2020-02-05 14:17:30 +08:00
winlin	f6fa889393	For #1592, default ff_log_level to info	2020-02-05 13:20:37 +08:00
winlin	c6d914bc13	Fix #1592, fix terminal echo off by redirect process stdin. 3.0.115	2020-02-05 13:04:00 +08:00
winlin	c50c51889a	For #1592, support ff_log_level and default to warning	2020-02-05 12:32:15 +08:00
winlin	2fa151726b	For #1592, rename ff_log_dir.	2020-02-05 12:15:44 +08:00
winlin	823b4fa56f	Merge branch '3.0release' into develop	2020-02-04 19:34:09 +08:00
winlin	a99cee2819	For #1186, refactor security check. 3.0.114	2020-02-04 19:33:11 +08:00
winlin	b9d45ba7d9	For #1186, refactor security check. 3.0.114	2020-02-04 19:21:15 +08:00
winlin	c51c378869	For #1186, refactor security check. 3.0.114	2020-02-04 19:07:54 +08:00
winlin	3023dc7b40	Update project code. 4.0.3	2020-02-04 17:11:22 +08:00
winlin	55fa62e41f	Update version4	2020-02-04 17:06:10 +08:00
winlin	59439cf8b5	Merge branch '3.0release' into develop	2020-02-04 17:05:19 +08:00
winlin	c01806d5c4	Refine version3	2020-02-04 17:04:03 +08:00
winlin	4f39303f37	Fix #939, response right A/V flag in FLV header. 3.0.113	2020-02-04 17:02:02 +08:00
winlin	68efca4fa9	For #939, always enable fast FLV streaming.	2020-02-04 16:39:01 +08:00
winlin	a2a6ca8258	For #939, always enable fast FLV streaming.	2020-02-04 16:13:48 +08:00
winlin	0621cd8c34	Merge branch '3.0release' into develop	2020-02-02 12:53:21 +08:00
winlin	d57c85827c	Release 3.0-b0, 3.0.112	2020-02-02 11:15:08 +08:00