8500 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	bd88df9ba8	Merge branch '4.0release' into merge/develop	2022-01-17 21:43:17 +08:00
winlin	d996aea7b9	Update	2022-01-17 21:43:13 +08:00
winlin	dc43a11aed	Enable rtmp2rtc and rtc2rtmp for docker.conf	2022-01-17 21:37:57 +08:00
winlin	ce5db9a040	Release v5.0.21	2022-01-17 15:06:21 +08:00
winlin	4bd4f4ad99	Merge	2022-01-17 14:41:44 +08:00
winlin	e2ea0ffadb	Merge branch 'develop' into merge/develop	2022-01-17 14:30:40 +08:00
winlin	5d8b950a06	Update CHANGELOG	2022-01-17 14:30:01 +08:00
winlin	b9bfe18829	CICD: Refine release for droplet	2022-01-17 14:13:42 +08:00
winlin	27e5d77302	Squash: Update README	2022-01-17 09:47:27 +08:00
winlin	f24f214402	Merge branch '4.0release' into merge/develop	2022-01-17 09:46:25 +08:00
winlin	ddcbcbd121	Merge branch 'develop' into merge/develop	2022-01-17 09:46:21 +08:00
winlin	2502726c39	Add label **good first issue** for issues	2022-01-17 09:45:08 +08:00
winlin	16f17848bb	Update README for **Cloud Virtual Machine**	2022-01-16 21:59:46 +08:00
winlin	55ea0a62d3	Build: Disable c++11 and c++14 for CentOS 6.0	2022-01-15 09:02:14 +08:00
winlin	d5c86dc5fa	Switch LICENSE from MIT to **MIT or MulanPSL-2.0**. v5.0.21	2022-01-13 18:40:22 +08:00
winlin	93aa0eb5ba	Squash: Fix bugs	2022-01-13 18:26:28 +08:00
winlin	5b75eadc0c	Update	2022-01-13 18:25:05 +08:00
winlin	6047aaa3de	Merge branch 'develop' into merge/develop	2022-01-13 18:22:02 +08:00
winlin	0dd6246c2f	Release v4.0-b3, 4.0 beta3, v4.0.229, 144393 lines.	2022-01-13 18:04:21 +08:00
winlin	7796083e9a	RTC: fix play rtc judge for config rtc2rtmp on. (#2872). v4.0.229	2022-01-13 17:07:10 +08:00
chundonglinlin	584889754c	RTC: fix play rtc judge for config rtc2rtmp on.(#2863) (#2872)	2022-01-13 17:03:03 +08:00
winlin	99ff853de9	Refine package variables. v4.0.228	2022-01-13 17:01:57 +08:00
winlin	8830d267f2	Refine conf for vm.conf	2022-01-13 16:20:03 +08:00
winlin	6a5bc27f9b	Support configure with --config as default config file. v4.0.227	2022-01-13 15:16:54 +08:00
winlin	3881c4c77e	Add SrsAutoFreeH to release ptr with hooks. (#2880). v4.0.226	2022-01-13 14:05:00 +08:00
winlin	73d0ce1cee	Support api to specify the WebRTC API port. v4.0.225	2022-01-13 13:34:06 +08:00
winlin	c6c2e97189	Support api_port to specify the WebRTC API port. v4.0.225	2022-01-13 12:16:45 +08:00
winlin	db3ceb445b	Support api_port to specify the WebRTC API port. v4.0.224	2022-01-13 12:07:34 +08:00
winlin	e6ab5db113	LiveSource: Refine fetch for external exposed interface. (#2873). v4.0.223	2022-01-13 11:47:14 +08:00
chundonglinlin	7580341a1e	LiveSource/RtcSource: Refine fetch for external exposed interface. (#2873)	2022-01-13 11:43:32 +08:00
winlin	71a4b3c3f7	Add conf/lighthouse.conf for LightHouse. v4.0.222	2022-01-13 11:38:25 +08:00
winlin	d47dd81f46	Refine the running homepage. v4.0.221	2022-01-13 11:10:11 +08:00
winlin	fb93631407	Refine the running homepage. v4.0.221	2022-01-13 11:00:11 +08:00
winlin	574afb4320	Refine the running homepage. v4.0.221	2022-01-13 10:44:10 +08:00
winlin	7e25d0d7f4	Refine the running homepage. v4.0.221	2022-01-12 22:03:46 +08:00
chundonglinlin	c30aa479a7	RTC: Fix both rtmp and rtc streams can be published at the same time. (#2875)	2022-01-12 09:12:29 +08:00
winlin	4110fb14cb	Squash: Fix bugs. v5.0.20	2022-01-11 08:40:37 +08:00
winlin	cce6c7bf13	Update	2022-01-11 08:39:31 +08:00
winlin	7a6f77bb80	Merge branch 'develop' into merge/develop	2022-01-11 08:27:46 +08:00
winlin	e08c68b917	Update contribution	2022-01-11 08:26:21 +08:00
chundonglinlin	750c58beff	RTC: fix play rtc judge for rtmp inactive.(#2863) (#2867)	2022-01-11 08:18:06 +08:00
winlin	2bc5e9a8b4	RTC: fix play crash or no stream for rtmp2rtc tips.(#2863). v4.0.220	2022-01-10 19:16:01 +08:00
chundonglinlin	c85daeb12d	RTC: fix play crash or no stream for rtmp2rtc tips.(#2728) (#2863)	2022-01-10 19:14:11 +08:00
winlin	f178d7aae0	Update README for HTTPS Callback	2022-01-10 14:18:22 +08:00
winlin	08910e5cce	Update README	2022-01-08 19:18:55 +08:00
winlin	2f6d6a0ac0	Change warn to trace for release query	2022-01-07 16:41:02 +08:00
winlin	623ca788aa	Update for HTTPS server	2022-01-06 21:59:47 +08:00
liuxiaoliang	4434bb1a25	SRT: use const string to sprint rtmp url. (#2847)	2022-01-06 12:02:31 +08:00
winlin	51ca3fd80a	Only discover api server ip as candidate.	2022-01-06 11:31:06 +08:00
winlin	6919011e86	Update sync script, ignore gb28181	2022-01-05 14:36:42 +08:00