winlin 6012ac4eb0 Refine code		2020-03-31 22:30:57 +08:00
..
app	Refine code	2020-03-31 22:30:57 +08:00
core	Merge branch '3.0release' into 4.0release	2020-03-29 00:13:41 +08:00
kernel	Merge branch '4.0release' into xialixin-dev-28181	2020-03-31 20:09:07 +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	Refine code	2020-03-31 22:30:57 +08:00
service	Merge branch '4.0release' into xialixin-dev-28181	2020-03-31 20:09:07 +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