5394 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	d81cde695d	Refactor code	2020-03-31 22:48:38 +08:00
winlin	e19b927f92	Merge GB28181	2020-03-31 22:45:20 +08:00
winlin	6012ac4eb0	Refine code	2020-03-31 22:30:57 +08:00
winlin	a342f460e7	Merge branch '4.0release' into xialixin-dev-28181	2020-03-31 20:09:07 +08:00
winlin	33455867f9	Merge branch 'dev-28181' of https://github.com/xialixin/srs into xialixin-dev-28181	2020-03-31 20:08:24 +08:00
winlin	df6274daf8	Merge branch 'feature/rtc' into develop	2020-03-31 18:19:15 +08:00
winlin	4ac8991a8e	Update author to runner365 for SRT	2020-03-31 18:10:44 +08:00
winlin	74ad7143e7	Change authro to Bepartofyou for RTC codec	2020-03-31 18:05:32 +08:00
winlin	45db63249d	Update author to John for RTC	2020-03-31 18:03:04 +08:00
winlin	6022ac5cdb	Add comments for RTC candidate.	2020-03-31 17:33:04 +08:00
winlin	ecf0f012b5	Add comments for RTC candidate.	2020-03-31 17:26:32 +08:00
winlin	c8aaa5a1a6	Update circle CI script	2020-03-31 16:40:08 +08:00
winlin	c7113f27e0	Play stream by WebRTC on iOS/Android/PC browser. 4.0.17	2020-03-31 09:35:36 +08:00
xialixin	c99fb99ab6	refactor gb28181, supporting SIP server enable, multiplex, API interface	2020-03-31 00:39:10 +08:00
winlin	03289012fd	Refactor code for RTC	2020-03-30 21:21:31 +08:00
winlin	e65b6283df	Merge remote-tracking branch 'john/rtc' into feature/rtc	2020-03-30 20:46:15 +08:00
winlin	f9f9cfda9b	Refine cherrypy install script	2020-03-30 18:25:22 +08:00
xiaozhihong	9dadcdffd6	Merge remote-tracking branch 'upstream/feature/rtc' into sdp	2020-03-30 15:16:44 +08:00
xiaozhihong	49da2099c1	sdp exchange.	2020-03-30 15:16:29 +08:00
winlin	bf297fd070	Refine make help	2020-03-29 21:36:41 +08:00
winlin	60d810693c	Refine rebuild components	2020-03-29 21:30:32 +08:00
winlin	056fcd2928	Refine clean script	2020-03-29 19:06:51 +08:00
winlin	40cc8ed47c	Refine file path for st and ffmpeg	2020-03-29 18:44:01 +08:00
winlin	a60dbc167a	Update macro	2020-03-29 18:01:46 +08:00
winlin	3b8450d4bd	Support cleanup componets	2020-03-29 17:54:27 +08:00
winlin	6935bb18ae	Merge branch '4.0release' into develop	2020-03-29 17:36:33 +08:00
winlin	6b8f0d84a3	Merge branch '3.0release' into 4.0release	2020-03-29 17:31:41 +08:00
winlin	80f315f1ae	Support utest on mac osx	2020-03-29 17:29:09 +08:00
winlin	22fbae139c	Refine links use relative path	2020-03-29 17:15:29 +08:00
winlin	22ec783c3f	Merge branch '3.0release' into 4.0release	2020-03-29 16:52:46 +08:00
winlin	1c65987472	Refine links use relative path	2020-03-29 16:51:56 +08:00
winlin	2ba8104b37	Update coverage script	2020-03-29 16:36:49 +08:00
winlin	b9a3df5c55	Update utest script	2020-03-29 16:18:20 +08:00
winlin	f8b0bc122b	Update build script	2020-03-29 15:48:57 +08:00
winlin	0081525380	Update package script	2020-03-29 15:29:07 +08:00
winlin	c0a8193537	Update build script	2020-03-29 15:23:40 +08:00
winlin	d5339acc57	Update package script	2020-03-29 14:12:37 +08:00
winlin	f674cab84f	Release 3.0-b4, 3.0.139	2020-03-29 14:00:37 +08:00
winlin	84652265d9	Update README	2020-03-29 00:23:16 +08:00
winlin	cc6a447332	Merge feature/rtc	2020-03-29 00:21:00 +08:00
winlin	32d818d69c	Merge 4.0release	2020-03-29 00:16:37 +08:00
winlin	13ee53434e	Merge branch '4.0release' into develop	2020-03-29 00:14:46 +08:00
winlin	3e0a7ee7fb	Merge branch '3.0release' into 4.0release	2020-03-29 00:13:41 +08:00
winlin	98a71954da	Support multiple OS/Platform build cache. 3.0.139	2020-03-29 00:09:17 +08:00
winlin	0fd75434a6	For #307, fast build openssl	2020-03-28 21:33:47 +08:00
winlin	c1e124786c	For #307, fix build warnings for rtc	2020-03-28 20:57:03 +08:00
winlin	dae7af8444	For #307, rtc support osx	2020-03-28 20:52:42 +08:00
winlin	04c3370458	Merge branch 'develop' into feature/rtc	2020-03-28 18:06:40 +08:00
winlin	f29db522c1	Merge branch '4.0release' into develop	2020-03-28 18:05:46 +08:00
winlin	9e8b88825b	Merge branch '3.0release' into 4.0release	2020-03-28 18:05:19 +08:00