7010 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	f5c9996c59	Merge	2021-04-24 19:40:33 +08:00
winlin	6f66cf0868	Player: Change the default from RTMP to HTTP-FLV.	2021-04-24 19:38:49 +08:00
winlin	5232f9e043	Disable CherryPy by --cherrypy=off. 4.0.90	2021-04-24 19:26:24 +08:00
winlin	de1c7522f0	SquashSRS3: Add console	2021-04-24 19:07:37 +08:00
winlin	9ed7565789	SquashSRS3: Package srs-console	2021-04-24 17:51:05 +08:00
winlin	56446825dc	Merge branch '4.0release' into merge/develop	2021-04-20 19:02:17 +08:00
winlin	49dffcd5d0	Merge branch 'develop' into merge/develop	2021-04-20 19:02:12 +08:00
winlin	cec0191b16	Happy 2021	2021-04-20 19:00:14 +08:00
winlin	6418ece694	SquashSRS4: Update description	2021-04-16 11:15:10 +08:00
winlin	9347329c42	Update	2021-04-16 11:14:32 +08:00
winlin	dc03f911ec	Merge branch '4.0release' into merge/develop	2021-04-16 11:14:08 +08:00
winlin	23342363a7	SquashSRS3: Update description	2021-04-16 11:13:34 +08:00
winlin	c22fc75345	SquashSRS4: Update description	2021-04-16 11:10:36 +08:00
winlin	20f1a1a4f1	Merge branch 'develop' into merge/develop	2021-04-16 11:09:56 +08:00
winlin	9cd19a6e52	Merge branch '4.0release' into merge/develop	2021-04-16 11:09:51 +08:00
winlin	650fa0af0c	SquashSRS3: Update description	2021-04-16 11:09:23 +08:00
winlin	8b74c7cb89	SquashSRS4: Happy 2021	2021-04-16 09:29:43 +08:00
winlin	b2be62a444	Merge branch 'develop' into merge/develop	2021-04-16 09:28:57 +08:00
winlin	2ea19a20dd	Merge 4.0	2021-04-16 09:28:53 +08:00
winlin	124455be09	Update script	2021-04-16 09:27:47 +08:00
winlin	d01e603b25	Happy 2021	2021-04-16 09:25:55 +08:00
stone	3eb3cb9b51	For #2275, fix bug for transcode engine config param.	2021-04-09 07:22:15 +08:00
winlin	36743914ff	Merge branch 'develop' into merge/develop	2021-04-09 07:21:28 +08:00
winlin	263ead07f0	Merge branch 'develop' into merge/develop	2021-04-09 07:20:57 +08:00
winlin	78af396c76	Merge branch '4.0release' into merge/develop	2021-04-09 07:20:53 +08:00
stone	6da91f7dea	For #2275, fix bug for transcode engine config param.	2021-04-09 07:19:31 +08:00
winlin	323306149d	SquashSRS4: Eliminate the dup code	2021-04-06 11:22:12 +08:00
winlin	a8fbae9e0a	Merge 4.0	2021-04-06 11:21:15 +08:00
winlin	aae0f61165	RTC: Eliminate the dup code	2021-04-06 10:56:40 +08:00
winlin	55426c6331	SquashSRS4: Fix RTC connection dispose bug	2021-04-06 10:51:42 +08:00
winlin	6efa5b37e1	Merge branch '4.0release' into merge/develop	2021-04-06 10:50:57 +08:00
winlin	061f367a82	RTC: Fix RTC connection dispose bug	2021-04-06 10:50:23 +08:00
winlin	4871c616b8	Update README	2021-04-05 12:47:21 +08:00
winlin	1ee77614fb	Refine comments	2021-04-05 12:14:26 +08:00
winlin	237c1e4d3d	SquashSRS4: Fix DTLS warnings for HTTP api	2021-04-05 08:29:29 +08:00
winlin	f40658ae35	Merge branch 'develop' into merge/develop	2021-04-05 08:28:55 +08:00
winlin	79a357a945	Merge branch '4.0release' into merge/develop	2021-04-05 08:28:48 +08:00
winlin	db7e820f04	RTC: Fix DTLS warnings for HTTP api	2021-04-05 08:28:16 +08:00
winlin	fcf72b48f9	SquashSRS4: Fix republish bug	2021-04-04 19:05:44 +08:00
winlin	30b1fa650c	Merge	2021-04-04 19:05:10 +08:00
winlin	ee978c319a	Merge branch '4.0release' into merge/develop	2021-04-04 19:04:43 +08:00
winlin	96003d4a52	RTC: Fix bug for republish stream. 4.0.89	2021-04-04 19:01:42 +08:00
winlin	52644f50c9	SquashSRS4: Fix republish bug	2021-04-04 18:50:59 +08:00
winlin	ff2b02f38b	Merge branch 'develop' into merge/develop	2021-04-04 18:50:05 +08:00
winlin	bae7484d53	Merge branch '4.0release' into merge/develop	2021-04-04 18:48:48 +08:00
winlin	8d9dd532b9	RTC: Fix bug for republish stream. 4.0.89	2021-04-04 18:35:02 +08:00
winlin	d80ba9d284	SquashSRS4: Fix memory leak	2021-04-01 17:35:40 +08:00
winlin	71388c1af6	Merge branch 'develop' into merge/develop	2021-04-01 17:35:15 +08:00
winlin	d455e594b9	Merge branch '4.0release' into merge/develop	2021-04-01 17:35:06 +08:00
winlin	3c59fedab6	RTC: Fix memory leak	2021-04-01 17:34:47 +08:00