7032 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	1fabe5137d	Merge branch 'develop' into merge/develop	2021-04-26 13:58:59 +08:00
winlin	099b6c963d	Merge branch '4.0release' into merge/develop	2021-04-26 13:58:55 +08:00
winlin	db37a4ac02	SquashSRS3: Add crossdomain.xml for install script.	2021-04-26 13:57:14 +08:00
winlin	f9d9f3a373	Modules: Fix build fail for global variables.	2021-04-25 13:34:57 +08:00
winlin	00a8eef580	Fix utest fail	2021-04-25 12:07:00 +08:00
winlin	d0fd0c4639	SquashSRS4: Update README	2021-04-25 08:59:26 +08:00
winlin	ddd9b23e4a	Merge branch 'develop' into merge/develop	2021-04-25 08:58:55 +08:00
winlin	2584329a9c	Merge branch '4.0release' into merge/develop	2021-04-25 08:58:51 +08:00
winlin	b5358d1cca	SquashSRS3: Update README	2021-04-25 08:55:15 +08:00
winlin	fe1c3a4ce1	SquashSRS4: Update readme	2021-04-24 22:52:48 +08:00
winlin	b2e71ccfff	Merge	2021-04-24 22:52:07 +08:00
winlin	d92fbafb20	SquashSRS3: Update readme	2021-04-24 22:45:55 +08:00
winlin	eba78149ad	SquashSRS4: Change push-RTSP as deprecated feature.	2021-04-24 21:40:09 +08:00
winlin	76c9034f0b	Merge	2021-04-24 21:39:37 +08:00
winlin	86f1a8b528	Merge branch '4.0release' into merge/develop	2021-04-24 21:38:48 +08:00
winlin	5516d3751f	Change push-RTSP as deprecated feature.	2021-04-24 21:33:44 +08:00
winlin	d4a8a72388	SquashSRS4: Add console. Disable cherrypy by default.	2021-04-24 19:45:05 +08:00
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	c95bfc4a46	Timer: Apply shared FastTimer to RTC server	2021-04-23 11:17:58 +08:00
winlin	7b413edbb7	Timer: Extract shared FastTimer to use one timer for all connections	2021-04-23 11:04:05 +08:00
winlin	7bdc9e8e96	Moduels: Refine the description	2021-04-21 11:18:35 +08:00
winlin	b29827d22c	Modules: Enable app files for module	2021-04-21 11:03:37 +08:00
winlin	aa07f45545	SquashSRS4: Happy 2021	2021-04-20 19:03:02 +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