winlin 217b8b94b6 Merge 3.0release		2020-03-28 17:45:14 +08:00
..
app	Merge 3.0release	2020-03-28 17:45:14 +08:00
core	Merge 3.0release	2020-03-28 17:45:14 +08:00
kernel	Merge 3.0release	2020-03-28 17:45:14 +08:00
libs	Fix bug for librtmp client ipv4/ipv6 socket. 3.0.122	2020-02-21 23:11:09 +08:00
main	Merge 3.0release	2020-03-28 17:45:14 +08:00
protocol	Merge branch '3.0release' into 4.0release	2020-03-21 22:42:17 +08:00
service	Support macOS OSX	2020-03-28 17:20:40 +08:00
srt	For #1636, fix bug for mux AAC to ADTS, never overwrite by RTMP sampling rate. 4.0.13	2020-03-13 16:56:00 +08:00
utest	Merge 3.0release	2020-03-28 17:45:14 +08:00