1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Commit graph

7631 commits

Author SHA1 Message Date
winlin
32bb99988e Merge 2021-06-24 22:10:31 +08:00
winlin
f2fd184578 Merge branch '4.0release' into merge/develop 2021-06-24 22:09:59 +08:00
winlin
6ec1a383fa Merge #2419 to fix SRT bug. 4.0.131 2021-06-24 22:09:09 +08:00
winlin
25262dd3cb Fix SRT bug. 4.0.131 2021-06-24 22:07:48 +08:00
Alex.CR
bb9aefd869 srt publish core dump bug (#2429)
* solve srt push bugs

Co-authored-by: shiwei <shiwei05@kuaishou.com>
2021-06-24 22:03:59 +08:00
Alex.CR
67ac720b92
srt publish core dump bug (#2429)
* solve srt push bugs

Co-authored-by: shiwei <shiwei05@kuaishou.com>
2021-06-24 22:03:18 +08:00
winlin
a594678e3d Squash #1685, #1282, #1547: Support ARM platform. 5.0.5 2021-06-22 07:49:48 +08:00
winlin
c183125af9 Merge branch '4.0release' into merge/develop 2021-06-22 07:46:19 +08:00
winlin
fed57f6f17 Refine scripts 2021-06-22 07:45:26 +08:00
winlin
27cac7f68e Merge 2021-06-22 07:25:47 +08:00
winlin
5906345a97 Fix #2413, fix RTMP to RTC bug 4.0.130 2021-06-21 14:37:41 +08:00
john
1347da81f8
Check audio/video track when rtc stream updated (#2418) 2021-06-21 14:35:37 +08:00
winlin
3aba2f3479 Add machine to build dir 2021-06-21 14:05:46 +08:00
winlin
2376c4cebb Add BBS link 2021-06-20 20:17:25 +08:00
winlin
fcb2b3da2c Update README 2021-06-20 19:44:39 +08:00
winlin
bc35a1fc4c Update README 2021-06-20 19:43:02 +08:00
winlin
1f0b5f0495 Update README 2021-06-20 19:39:26 +08:00
winlin
1254f5b1d4 Update README 2021-06-20 19:38:40 +08:00
winlin
52fb6aed10 Merge 2021-06-20 17:30:59 +08:00
winlin
92327b6e20 Merge branch 'develop' into merge/develop 2021-06-20 17:26:10 +08:00
winlin
70e552ef23 Guess where FFmpeg is. 4.0.129 2021-06-20 17:08:09 +08:00
winlin
6038276b4e Fix bug for build on osx 2021-06-20 17:01:50 +08:00
winlin
440883e6e6 Fix bug for 'make st' 2021-06-20 16:56:25 +08:00
winlin
4969156355 Add CI for armv7 and aarch64 2021-06-20 15:20:30 +08:00
winlin
593391e765 Add CI for armv7 and aarch64 2021-06-20 15:20:00 +08:00
winlin
a52e7c08ea Update AUTHORS 2021-06-20 15:15:47 +08:00
winlin
229578cc65 Fix #1685, support RTC cross-build for armv7/armv8(aarch64). 4.0.128 2021-06-20 15:11:54 +08:00
winlin
1e9de0e191 For #1685: Cross build RTC with FFmpeg 2021-06-19 21:55:12 +08:00
winlin
1c75a270b3 RTC: Eliminate dead code. 2021-06-17 10:52:00 +08:00
winlin
623a453787 Fix #2214, remove detection for gmc and gmp. 2021-06-17 08:39:19 +08:00
winlin
efdbf37255 Squash: Move GB28181 to feature/gb28181. 5.0.4 2021-06-16 14:03:55 +08:00
winlin
ca2654f6a7 Merge branch '4.0release' into merge/develop 2021-06-16 14:03:01 +08:00
winlin
df20fe6c9d Fix build fail 2021-06-16 14:02:48 +08:00
winlin
c5227c4831 Update 2021-06-16 13:45:12 +08:00
winlin
9932ad83b6 Merge branch 'develop' into merge/develop 2021-06-16 13:43:35 +08:00
winlin
4f44c3c995 Fix build fail 2021-06-16 13:43:25 +08:00
winlin
17a8fee8c4 Tag 5.0.4 2021-06-16 13:41:40 +08:00
winlin
0a2a5d2145 Squash: Move GB28181 to feature/gb28181. 2021-06-16 13:40:54 +08:00
winlin
d2a4e08ba0 Merge 2021-06-16 13:39:22 +08:00
winlin
2e3443c84a Merge branch 'develop' into merge/develop 2021-06-16 13:38:47 +08:00
winlin
863f91ddb4 Fix build fail 2021-06-16 08:43:33 +08:00
winlin
68c48e27f5 Change GB28181 to feature/gb28181. 4.0.127 2021-06-16 08:27:37 +08:00
winlin
49826081b1 Squash: Update README 2021-06-15 16:11:29 +08:00
winlin
e16c0269c1 Merge branch 'develop' into merge/develop 2021-06-15 16:10:45 +08:00
winlin
8350b7a4e3 Merge branch '4.0release' into merge/develop 2021-06-15 16:10:35 +08:00
winlin
4e93696bc6 Update README 2021-06-15 15:55:52 +08:00
winlin
283b3a2cee Squash: Update README 2021-06-15 15:51:28 +08:00
winlin
4b211380c2 Update 2021-06-15 15:50:07 +08:00
winlin
77677025bd Merge 2021-06-15 15:45:49 +08:00
winlin
6596f92b54 Update 2021-06-13 09:58:25 +08:00