7578 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	e171715676	Merge branch '4.0release' into merge/develop	2021-09-17 14:47:03 +08:00
winlin	e36c90cb39	Merge branch 'develop' into merge/develop	2021-09-17 14:46:59 +08:00
winlin	4456a275b6	PushFLV: Fix bug, add stat	2021-09-17 14:20:35 +08:00
winlin	5828d64a3d	For #2613, #2614, #2454, v4.0.162	2021-09-15 21:46:59 +08:00
Winlin	560e7c3c2f	Fix #2613, Try libopus and opus for ARM (#2614) ... * Fix #2613, Try libopus and opus for ARM * Refine code	2021-09-15 21:44:13 +08:00
winlin	28e3a1ca69	Squash: Merge SRS 4.0	2021-09-13 09:57:47 +08:00
winlin	6b20f4a787	Merge branch '4.0release' into merge/develop	2021-09-13 09:57:12 +08:00
winlin	b39a139824	Merge branch 'develop' into merge/develop	2021-09-13 09:57:08 +08:00
winlin	501b3833a1	RTMP: Remove bandwidth test	2021-09-13 09:41:21 +08:00
winlin	a830289d97	Squash: Merge SRS4.0	2021-09-07 08:20:43 +08:00
winlin	4d61863bb9	Merge branch '4.0release' into merge/develop	2021-09-07 08:18:43 +08:00
winlin	ca03c53c40	Merge branch 'develop' into merge/develop	2021-09-07 08:18:34 +08:00
Justin Kromlinger	a583d7efb4	Set empty HTTP paths to '/' to avoid malformed requests (#2329) ... This resolves #1610.	2021-09-07 08:17:53 +08:00
Justin Kromlinger	8aee0169ce	Set empty HTTP paths to '/' to avoid malformed requests (#2329) ... This resolves #1610.	2021-09-07 08:15:27 +08:00
Huachao Mao	ff9e2339c1	Fix stream api iterator not incremented (#2582)	2021-09-07 08:14:40 +08:00
Huachao Mao	53cb333713	Support pagination for stream api (#2572)	2021-09-06 10:10:53 +08:00
winlin	fef474d503	Squash: Merge 4.0	2021-09-05 15:05:06 +08:00
winlin	7f6185b127	Merge branch '4.0release' into merge/develop	2021-09-05 15:04:15 +08:00
winlin	da6f70f73b	Merge branch 'develop' into merge/develop	2021-09-05 15:04:10 +08:00
winlin	eff225a800	Refine dockerfile	2021-09-05 14:58:47 +08:00
winlin	19c0a9eb4b	Suqash: Merge 4.0	2021-09-05 14:17:41 +08:00
winlin	e5373c9390	Merge branch '4.0release' into merge/develop	2021-09-05 14:15:59 +08:00
winlin	fd32617677	Merge branch 'develop' into merge/develop	2021-09-05 14:14:29 +08:00
winlin	f316b8fbdf	Release 4.0 dev5, v4.0.161	2021-09-05 14:12:26 +08:00
winlin	ec554e14d0	Merge #2581, Fix listen ipv6 and port. 4.0.161	2021-09-05 14:10:53 +08:00
ChenGH	3f94d26ca4	For #1920, refine rtmp listen ip and port check (#2581)	2021-09-05 14:05:28 +08:00
ChenGH	714e182096	fix srs_string_replace deap loop when new_str inclue old_str (#2580)	2021-09-04 22:29:21 +08:00
winlin	6bb11a72d0	For #2282, #2181, Move DVR async worker from SrsDvrPlan to global.	2021-09-04 12:42:23 +08:00
winlin	90b5ed2202	For #2282, #2181, Remove reload for dvr_apply. 4.0.160	2021-09-04 12:29:07 +08:00
BoringWednesday	1db155fa2f	SRT: Add member of adaptation_field and fix pos not add after memcpy. (#2066)	2021-09-04 10:26:07 +08:00
winlin	cf3129220d	Log: Refine the tail help log, show last 30 lines	2021-08-31 17:54:01 +08:00
winlin	7ab3e4a86c	Squash: Merge SRS 4.0	2021-08-28 09:03:06 +08:00
winlin	749a98acd6	Merge branch '4.0release' into merge/develop	2021-08-28 09:01:49 +08:00
winlin	a018bf8409	Merge branch 'develop' into merge/develop	2021-08-28 09:01:38 +08:00
winlin	b6d0c73cda	For #1859, Enhancement: Add param and stream to on_connect. 4.0.159	2021-08-28 09:00:25 +08:00
pyw	7abc9b640a	SRT: fix srt stream play map error (#1890) ... * fix url_sz memory out of bounds * fix srt play map error Co-authored-by: pengyouwei <pengyouwei@comtom.cn>	2021-08-28 08:56:20 +08:00
Matin Zadeh Dolatabad	7b14281367	Enhancement: Add param and stream to on_connect (#1859) ... Add stream and param to hook call on_connect for better use	2021-08-28 08:55:26 +08:00
winlin	f86d6fd073	Squash: Merge SRS 4.0	2021-08-27 07:57:02 +08:00
winlin	4d6daeae23	Merge branch '4.0release' into merge/develop	2021-08-27 07:56:25 +08:00
winlin	a598d5ff62	Merge branch 'develop' into merge/develop	2021-08-27 07:56:21 +08:00
Haibo Chen	c4a64ee470	Use SrsAsyncCallWorker in http hooks instead, to covert to async call. (#2542) ... * Use SrsAsyncCallWorker in http hooks instead, to covert to async call. * delete invalid function	2021-08-27 07:49:33 +08:00
Haibo Chen	a7feedabc6	Use SrsAsyncCallWorker in http hooks instead, to covert to async call. (#2542) ... * Use SrsAsyncCallWorker in http hooks instead, to covert to async call. * delete invalid function	2021-08-27 07:44:19 +08:00
Haibo Chen	c8bf98e8e2	Support for multiple SPS/PPS, then pick the first one. (#2544)	2021-08-27 07:32:02 +08:00
Haibo Chen	826f5121c5	Support for multiple SPS/PPS, then pick the first one. (#2544)	2021-08-27 07:27:33 +08:00
winlin	38b0b1dab2	Squash: Fix ingest bug. Refine AUTHORS.	2021-08-25 08:11:44 +08:00
winlin	6e9f1a864c	Merge	2021-08-25 08:04:23 +08:00
winlin	23730fa483	Update AUTHORS	2021-08-25 07:43:35 +08:00
winlin	2e8766515e	Merge	2021-08-25 07:37:42 +08:00
winlin	573e3236da	Merge branch 'develop' into merge/develop	2021-08-25 07:35:37 +08:00
winlin	ef2442b666	Update AUTHORS	2021-08-25 07:35:27 +08:00