winlin ae0871d696 Merge branch '4.0release' into merge/develop		2021-03-31 18:24:10 +08:00
..
app	Merge branch '4.0release' into merge/develop	2021-03-26 14:58:30 +08:00
core	Merge branch '4.0release' into merge/develop	2021-03-26 14:58:30 +08:00
kernel	RTC: Refine comments for SrsRtpPacket2	2021-03-31 17:46:45 +08:00
main	Remove dead code: memory watch	2021-02-19 18:53:40 +08:00
protocol	Live: Support follow HTTP/302 for HTTP/HTTPS FLV edge.	2021-03-17 16:53:39 +08:00
srt	fix, getsockopt SRTO_MAXBW memory overflow	2020-07-11 21:28:30 +08:00
utest	SquashSRS4: Regine DTLS and add regression tests. 4.0.84	2021-03-10 08:29:40 +08:00