8403 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	9194d28d0c	Merge branch '4.0release' into merge/develop	2021-09-26 17:11:39 +08:00
winlin	ad4b648ed2	For #2545, Refine code with space lines.	2021-09-26 17:07:59 +08:00
johzzy	ee23e3abed	fix some crash in rtc. (#2545)	2021-09-26 17:04:00 +08:00
johzzy	dc778020fc	fix some crash in rtc. (#2545)	2021-09-26 17:01:53 +08:00
winlin	eb7aa98790	Merge branch 'develop' into merge/develop	2021-09-25 10:30:53 +08:00
winlin	b654fbdce4	Merge branch '4.0release' into merge/develop	2021-09-25 10:30:48 +08:00
winlin	81fa762b4f	Update the SRS logo	2021-09-25 10:21:24 +08:00
winlin	149ad80b5d	Squash: Merge SRS 4.0	2021-09-25 10:09:25 +08:00
winlin	00bb52bddf	Merge branch 'develop' into merge/develop	2021-09-25 09:04:48 +08:00
winlin	f2ff4800fe	Merge branch '4.0release' into merge/develop	2021-09-25 09:04:43 +08:00
winlin	10fe04ac18	LIVE: Add conf/live.conf for RTMP/FLV/HLS	2021-09-25 09:01:15 +08:00
winlin	34cd7b2586	Squash: Merge SRS 4.0	2021-09-23 22:35:52 +08:00
winlin	66f8e38b42	Merge branch 'develop' into merge/develop	2021-09-23 22:05:39 +08:00
winlin	f7b86a5b8d	Merge branch '4.0release' into merge/develop	2021-09-23 22:05:34 +08:00
winlin	79d73bafcf	Refine code space	2021-09-23 22:04:14 +08:00
winlin	c8d3542979	Fix build failed.	2021-09-23 22:04:08 +08:00
winlin	f01c9638f1	Support http callback on_play/stop. 5.0.12	2021-09-23 13:38:04 +08:00
winlin	5e453f0bab	Update	2021-09-23 13:36:56 +08:00
winlin	8a78dc6868	Merge branch '4.0release' into merge/develop	2021-09-23 13:36:25 +08:00
winlin	31672806aa	For #2618, #2578, SRS 4.0.163	2021-09-23 13:34:45 +08:00
Haibo Chen	36b813b971	Enhance HLS: support http callback on_play/stop, support statistic (#2578) ... * Enhance HLS: support http callback on_play/stop, support statistic * make code readable * make code readable * rename secret	2021-09-23 13:32:15 +08:00
Haibo Chen	f901831362	Enhance HLS: support http callback on_play/stop, support statistic (#2578) ... * Enhance HLS: support http callback on_play/stop, support statistic * make code readable * make code readable * rename secret	2021-09-23 13:31:45 +08:00
zozobreakzou	46adcfb6c9	[rtc] *Fix Fua package bug(payload size minus one). (#2618) ... * This can cause webrtc video PacketBuffer assemble corrupt when (nal size - 1) % 1300 == 0 * issues about webrtc all caused by this bug	2021-09-23 11:10:16 +08:00
winlin	6693c73a4c	Update README with docker	2021-09-22 08:33:59 +08:00
winlin	40f8460929	Squash: Merge SRS 4.0	2021-09-17 14:48:22 +08:00
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