external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity
5246 commits 14 branches 107 tags 377 MiB
Commit graph

5246 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
yanghuiwen
2911c814c4 更新CMakeLists.txt文件，使项目能在clion编译通过 2020-03-20 17:07:16 +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
winlin
70307ed8f9 Update README 2020-03-14 14:35:57 +08:00
winlin
446e5f9a0c Update README 2020-03-14 14:34:20 +08:00
winlin
fc3704e54e Update README 2020-03-14 14:32:49 +08:00
winlin
a7c8980a60 For #1636, muxing sh, use sound_rate if aac sr not set. 2020-03-13 17:36:22 +08:00
winlin
7036f839d2 For #1636, add comments 2020-03-13 17:05:22 +08:00
winlin
aa20a04abb For #1636, fix bug for mux AAC to ADTS, never overwrite by RTMP sampling rate. 4.0.13 2020-03-13 16:56:00 +08:00
winlin
c66f33ac87
Merge pull request #1636 from runner365/3.0release.srt.dev 
support all aac sample rate in srt2rtmp
 2020-03-13 16:46:49 +08:00
winlin
08bffc60fb Update install 2020-03-13 16:29:54 +08:00
winlin
1382337cb4 Merge SRS3 2020-03-12 22:42:33 +08:00
winlin
856ed5a971 For #1635, inotify watch ConfigMap for reload. 3.0.134 2020-03-12 22:26:34 +08:00
winlin
bb509d23e2 For #1635, inotify watch ConfigMap for reload. 3.0.133 2020-03-12 22:08:23 +08:00
winlin
88368ed18d For #1635, inotify watch ConfigMap for reload. 3.0.132 2020-03-12 21:58:29 +08:00
winlin
940798a9c7 For #1635, inotify watch ConfigMap for reload. 3.0.131 2020-03-12 21:45:10 +08:00
runner365
f102a598b8 Merge branch 'develop' into 3.0release.srt.dev 2020-03-12 20:30:59 +08:00
runner365
b9195122cf support all sample rate in aac 2020-03-12 20:30:07 +08:00
winlin
5e60c8f9cc For #1635, inotify watch ConfigMap for reload. 3.0.130 2020-03-12 19:37:31 +08:00
winlin
9b663c070a Fix #1635, support auto reaload config by inotify. 3.0.129 2020-03-12 18:14:23 +08:00
winlin
b33751e2c1 Merge SRS3 2020-03-12 12:18:15 +08:00