external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity
5264 commits 13 branches 107 tags 375 MiB
Commit graph

5264 commits

This branch
This branch
All branches
Author SHA1 Message Date
winlin
6012ac4eb0 Refine code 2020-03-31 22:30:57 +08:00
winlin
a342f460e7 Merge branch '4.0release' into xialixin-dev-28181 2020-03-31 20:09:07 +08:00
winlin
33455867f9 Merge branch 'dev-28181' of https://github.com/xialixin/srs into xialixin-dev-28181 2020-03-31 20:08:24 +08:00
xialixin
c99fb99ab6 refactor gb28181, supporting SIP server enable, multiplex, API interface 2020-03-31 00:39:10 +08:00
winlin
6b8f0d84a3 Merge branch '3.0release' into 4.0release 2020-03-29 17:31:41 +08:00
winlin
80f315f1ae Support utest on mac osx 2020-03-29 17:29:09 +08:00
winlin
22ec783c3f Merge branch '3.0release' into 4.0release 2020-03-29 16:52:46 +08:00
winlin
1c65987472 Refine links use relative path 2020-03-29 16:51:56 +08:00
winlin
2ba8104b37 Update coverage script 2020-03-29 16:36:49 +08:00
winlin
b9a3df5c55 Update utest script 2020-03-29 16:18:20 +08:00
winlin
f8b0bc122b Update build script 2020-03-29 15:48:57 +08:00
winlin
0081525380 Update package script 2020-03-29 15:29:07 +08:00
winlin
c0a8193537 Update build script 2020-03-29 15:23:40 +08:00
winlin
d5339acc57 Update package script 2020-03-29 14:12:37 +08:00
winlin
f674cab84f Release 3.0-b4, 3.0.139 2020-03-29 14:00:37 +08:00
winlin
3e0a7ee7fb Merge branch '3.0release' into 4.0release 2020-03-29 00:13:41 +08:00
winlin
98a71954da Support multiple OS/Platform build cache. 3.0.139 2020-03-29 00:09:17 +08:00
winlin
9e8b88825b Merge branch '3.0release' into 4.0release 2020-03-28 18:05:19 +08:00
winlin
218fe332aa For #1250, support osx build 2020-03-28 18:04:34 +08:00
winlin
217b8b94b6 Merge 3.0release 2020-03-28 17:45:14 +08:00
winlin
0a030a4ade Update 2020-03-28 17:42:26 +08:00
winlin
2d287e3723 Merge branch 'feature/macos' into 3.0release 2020-03-28 17:24:11 +08:00
winlin
3556da40ce Fix #1250, Support macOS, OSX, MacbookPro, Apple Darwin. 3.0.138 2020-03-28 17:23:11 +08:00
winlin
c339542ce0 Support macOS OSX 2020-03-28 17:20:40 +08:00
winlin
b3b76b0ca6 Update readme 2020-03-24 13:17:05 +08:00
winlin
b12f0e8c8b Update readme 2020-03-24 13:12:00 +08:00
winlin
be746da21c Merge branch '3.0release' into 4.0release 2020-03-21 22:42:17 +08:00
winlin
0dd6c31487 Fix #1629, fix kickoff FLV client bug. 3.0.137 2020-03-21 22:41:25 +08:00
winlin
850a4bbf20 Fix #1619, configure without utest by default. 3.0.136 2020-03-21 20:41:37 +08:00
winlin
f89b4b3b26 For #1651, fix return pnwrite of srs_write_large_iovs. 3.0.135 2020-03-21 20:20:40 +08:00
winlin
355f351435
Merge pull request #1651 from lam2003/3.0release 
修复srs_write_large_iovs中nwrite未累加的错误
 2020-03-21 19:44:37 +08:00
winlin
b6b52363fb Update authors 2020-03-21 19:41:59 +08:00
winlin
97035d2301
Merge pull request #1654 from cainiaoDJ/update_cmakelists_for_clion 
更新CMakeLists.txt文件，使项目能在clion编译通过
 2020-03-21 19:39:46 +08:00
winlin
955de3dac9 Merge branch '3.0release' into 4.0release 2020-03-21 19:36:16 +08:00
winlin
75f62dc653 Update mirror 2020-03-21 16:34:18 +08:00
winlin
5a55cff7ba Update mirror 2020-03-21 16:30:29 +08:00
winlin
de9a004ff7 Merge branch 'dev-28181' of https://github.com/xialixin/srs into feature/gb28281-2 2020-03-20 21:39:04 +08:00
yanghuiwen
2911c814c4 更新CMakeLists.txt文件，使项目能在clion编译通过 2020-03-20 17:07:16 +08:00
xialixin
8b4f84e336 fix push.gb28181.conf, gb28181conn repeat call serve() 2020-03-20 10:38:38 +08:00
xialixin
cbe9c1dabc Support gb28181 sip over udp, ps steam over rtp 2020-03-20 00:01:48 +08:00
winlin
737e4bc32d Update 2020-03-19 17:57:23 +08:00
winlin
83f743645b Release multiple processes for SRS by reuseport 2020-03-19 17:49:37 +08:00
l
bbfb03f98a
修复srs_write_large_iovs中nwrite未累加的错误 2020-03-19 14:36:56 +08:00
l
f9114770af
Merge pull request #2 from ossrs/3.0release 
update to latest
 2020-03-19 14:32:35 +08:00
winlin
aead1a5b74 Release 3.0.134, 3.0-b3 2020-03-18 16:33:08 +08:00
winlin
9ba861f42f 3.0release is beta now 2020-03-16 15:11:34 +08:00
winlin
a8ddd5afe7 For #1635, refine inotify watch for relative path 2020-03-16 11:52:31 +08:00
winlin
8db2c3d821 For #1635, refine inotify watch for relative path 2020-03-16 11:39:20 +08:00
winlin
a135eb2144 Merge SRS3 2020-03-14 14:39:11 +08:00
winlin
88336b1f5e Remove KAFKA config, because it's removed from code 2020-03-14 14:38:26 +08:00