1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Commit graph

7625 commits

Author SHA1 Message Date
winlin
79f2057923 Merge branch '4.0release' into merge/develop 2021-10-03 14:34:31 +08:00
winlin
73c76e96b7 Actions: Show commit and messages 2021-10-03 14:34:23 +08:00
winlin
99a967c5c3 Merge branch '4.0release' into merge/develop 2021-10-03 14:16:13 +08:00
winlin
fde85271f4 Merge 2021-10-03 14:16:07 +08:00
winlin
b6d02a51b8 OpenWRT: Fix build issues 2021-10-03 14:15:23 +08:00
winlin
c48c9603c0 Actions: Create source tar lik srs-server-5.0.14.tar.gz 2021-10-03 07:49:02 +08:00
winlin
b400c3d611 Merge branch '4.0release' into merge/develop 2021-10-03 07:45:58 +08:00
winlin
84a6695684 Merge branch 'develop' into merge/develop 2021-10-03 07:45:54 +08:00
winlin
efbff98046 Actions: Create source tar lik srs-server-4.0.165.tar.gz 2021-10-03 07:40:29 +08:00
winlin
f3c67c7a09 Actions: Refine source tar file 2021-10-03 07:26:43 +08:00
winlin
4b37f650f7 Actions: Support create release with source tar automatically. v5.0.13 2021-10-03 07:12:34 +08:00
winlin
5ac0209ed2 Merge branch 'develop' into merge/develop 2021-10-02 21:37:23 +08:00
winlin
f964dc8ef2 Merge branch '4.0release' into merge/develop 2021-10-02 21:37:19 +08:00
winlin
38f0109b21 Actions: Support create release with source tar automatically. v4.0.164 2021-10-02 21:32:38 +08:00
winlin
6e8bf8c525 Actions: Auto release SRS 5.0. 2021-10-02 18:59:51 +08:00
winlin
5d2c0498ff Merge 2021-10-02 18:57:27 +08:00
winlin
78e5b6f1b0 Merge branch 'develop' into merge/develop 2021-10-02 18:57:01 +08:00
winlin
8aa9fff271 Remove removed CircleCI 2021-10-02 18:53:54 +08:00
winlin
96a33b5748 ST: Support Cygwin64 and MIPS. 5.0.13 2021-10-02 08:56:40 +08:00
winlin
1836847269 ST: Support Cygwin64 and MIPS 2021-10-02 08:54:53 +08:00
winlin
7d3ec991e1 Squash: Merge SRS 4.0 2021-09-26 17:12:55 +08:00
winlin
df4404f9a9 Merge 2021-09-26 17:12:29 +08:00
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