Commit Graph

5235 Commits (d21ef106a0dfbe721da6a99021b45a8654163972)
 

Author SHA1 Message Date
winlin 304b92cc36 Update maintainers 5 years ago
winlin 8079564077 Update maintainers 5 years ago
winlin 0723b36f0e Merge branch '3.0release' into develop 5 years ago
winlin 1604fcf35a Update authors 5 years ago
winlin 16173194b9 Release 3.0-beta1, r3.0b1, 3.0.117 5 years ago
winlin 131acf5bb0 For #1595, migrating streaming from ossrs.net to r.ossrs.net. 3.0.117 5 years ago
winlin 4276bea463 Migrating streaming service from ossrs.net to r.ossrs.net 5 years ago
winlin 23324cde31 Migrating streaming service from ossrs.net to r.ossrs.net 5 years ago
winlin 21c2cb6512 Update issue template 5 years ago
winlin 51d6c367f5 Merge remote-tracking branch 'runner365/3.0release' into develop 5 years ago
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
5 years ago
runner365 94741c1676 update srt2rtmp about rtmp listen tcp port 5 years ago
runner365 76204fa2ba Merge remote-tracking branch 'srs/develop' into 3.0release 5 years ago
runner365 8e40f9cf22 update srt2rtmp about rtmp listen tcp port 5 years ago
winlin 8b7fbac7d4 SRT supports detail config for DynamicConfig. 4.0.4 5 years ago
winlin 37fdecba3c Merge remote-tracking branch 'runner365/3.0release' into develop 5 years ago
Alex.CR 9dad53691e
solve latency parameter error (#1600)
* solve latency parameter error
5 years ago
runner365 ca1efc6a34 solve merge problem 5 years ago
runner365 d8419bd4dd solve latency parameter error 5 years ago
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
5 years ago
runner365 24f286684e add srt parameter configure 5 years ago
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
5 years ago
runner365 6f4c124f58 solve merge confict 5 years ago
runner365 1a1d0e9267 add srt_epoll_clear_usocks 5 years ago
runner365 548c918efb mpegts discard header is not 0x47 5 years ago
runner365 4fdf242e99 change two thread to one thread 5 years ago
winlin d2a071f041 Add TODO for incompatible APIs of librtmp 5 years ago
Alex.CR 3847807534
solve srt repush bugs (#1596)
* if there isn't srt connect, it needn't epoll wait

* solve repush srt bugs
5 years ago
runner365 1c6203bda2 solve repush srt bugs 5 years ago
runner365 1941f55475 if there isn't srt connect, it needn't epoll wait 5 years ago
winlin bdc7973596 Merge branch '3.0release' into develop 5 years ago
winlin fc769550db Fix #665, fix HTTP-FLV reloading bug. 3.0.116 5 years ago
winlin f6fa889393 For #1592, default ff_log_level to info 5 years ago
winlin c6d914bc13 Fix #1592, fix terminal echo off by redirect process stdin. 3.0.115 5 years ago
winlin c50c51889a For #1592, support ff_log_level and default to warning 5 years ago
winlin 2fa151726b For #1592, rename ff_log_dir. 5 years ago
winlin 823b4fa56f Merge branch '3.0release' into develop 5 years ago
winlin a99cee2819 For #1186, refactor security check. 3.0.114 5 years ago
winlin b9d45ba7d9 For #1186, refactor security check. 3.0.114 5 years ago
winlin c51c378869 For #1186, refactor security check. 3.0.114 5 years ago
winlin 3023dc7b40 Update project code. 4.0.3 5 years ago
winlin 55fa62e41f Update version4 5 years ago
winlin 59439cf8b5 Merge branch '3.0release' into develop 5 years ago
winlin c01806d5c4 Refine version3 5 years ago
winlin 4f39303f37 Fix #939, response right A/V flag in FLV header. 3.0.113 5 years ago
winlin 68efca4fa9 For #939, always enable fast FLV streaming. 5 years ago
winlin a2a6ca8258 For #939, always enable fast FLV streaming. 5 years ago
winlin 0621cd8c34 Merge branch '3.0release' into develop 5 years ago
winlin d57c85827c Release 3.0-b0, 3.0.112 5 years ago
winlin fb555b4d8f Merge branch '3.0release' into develop 5 years ago