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
7288 commits 13 branches 107 tags 375 MiB
Commit graph

7288 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
winlin
8717d84472 Refine README 2021-06-13 08:36:12 +08:00
winlin
a7df9788a6 Squash: Refine README 2021-06-10 20:55:57 +08:00
winlin
0ebf16d29e Merge branch '4.0release' into merge/develop 2021-06-10 20:52:34 +08:00
winlin
9d028d3605 Refine README.md 2021-06-10 20:46:25 +08:00
winlin
d84770afc5 Merge 2021-06-10 20:43:52 +08:00
winlin
e0f8d0976e Merge branch 'develop' into merge/develop 2021-06-10 20:42:29 +08:00
winlin
e41b3bd37c Fix typo 2021-06-10 20:24:11 +08:00
winlin
1188bcc325 Update README 2021-06-10 14:16:42 +08:00
winlin
9c96d20126 Update README 2021-06-10 14:12:24 +08:00
winlin
d51d1f7d8f Refine README 2021-06-10 14:03:13 +08:00
winlin
dfb0887e1d Extract CHANGELOG.md 2021-06-10 13:39:58 +08:00
winlin
f75ef2f808 Build: Support --shared-ffmpeg 2021-06-01 15:39:37 +08:00
winlin
dbe7779fc8 Merge branch '4.0release' into merge/develop 2021-06-01 15:38:42 +08:00
winlin
f5a769c22e Merge branch 'develop' into merge/develop 2021-06-01 15:38:38 +08:00
winlin
d5266725e2 Build: Support --shared-ffmpeg to link with *.so for LGPL license. 4.0.126 2021-06-01 15:34:31 +08:00
winlin
d1d0b9ca5c Doc: Update 3rdparty links 2021-06-01 14:17:42 +08:00
winlin
785d2fce08 Build: Support --shared-srt 2021-06-01 12:29:22 +08:00
winlin
9e9aaa8ed9 Merge branch '4.0release' into merge/develop 2021-06-01 12:28:23 +08:00
winlin
33fe0a5d13 Merge branch 'develop' into merge/develop 2021-06-01 12:28:19 +08:00
winlin
f44224a2a1 Build: Support --shared-srt to link with *.so for MPL license. 4.0.125 2021-06-01 12:24:13 +08:00
winlin
8434271578 Build: Refine configure option help 2021-06-01 11:44:14 +08:00
winlin
7e657ae654 Refine AUTHORS format 2021-06-01 09:36:28 +08:00
winlin
71bb8f8a05 Merge branch '4.0release' into merge/develop 2021-06-01 09:35:47 +08:00
winlin
afeeddd821 Merge branch 'develop' into merge/develop 2021-06-01 09:35:42 +08:00
winlin
689100f651 Refine AUTHORS format 2021-06-01 09:04:38 +08:00
winlin
9e2c6d458e Fix build fail for SPDX 2021-05-31 13:46:19 +08:00
winlin
97749d2b02 Merge branch '4.0release' into merge/develop 2021-05-31 13:45:59 +08:00
winlin
301d20eac8 Merge branch 'develop' into merge/develop 2021-05-31 13:45:57 +08:00
winlin
67272f0721 Fix build fail for SPDX 2021-05-31 13:45:23 +08:00
winlin
15901cacee SquashSRS4: Use SPDX-License-Identifier: MIT. 5.0.3 2021-05-31 13:42:20 +08:00
winlin
5e0f1f8034 Update 2021-05-31 13:38:51 +08:00
winlin
e90321334e Merge branch '4.0release' into merge/develop 2021-05-31 13:37:24 +08:00
winlin
9418e7d064 Merge branch 'develop' into merge/develop 2021-05-31 13:37:20 +08:00
winlin
0777ee9cab Update README.md 2021-05-31 13:36:30 +08:00
winlin
3cd22b6e6e Use SPDX-License-Identifier: MIT. 4.0.124 2021-05-31 12:59:21 +08:00
winlin
4cf1f852cf Fix bugs for GB28181 and RTC. 4.0.123 2021-05-28 22:23:17 +08:00
johzzy
7be6025546 fix: fix typo about inactive. (#2380) 2021-05-28 22:20:36 +08:00
johzzy
2aad8ad5bd
fix: fix typo about inactive. (#2380) 2021-05-28 22:20:04 +08:00
winlin
81bda41b31 SquashSRS4: Refine srs.sdk.js 2021-05-28 21:44:51 +08:00
winlin
665bae9b44 Update 2021-05-28 21:43:39 +08:00
winlin
4e79e91ede Merge branch '4.0release' into merge/develop 2021-05-28 21:43:08 +08:00
winlin
a8d40f4cb1 Update AUTHORS 2021-05-28 21:40:43 +08:00
louis.xia
1c7c74b01a GB28181: Fix parse rtp tcp failed (#2382) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

* fix gb28181 support tcp stack is setup:passive

* Update push.gb28181.tcp.conf

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
Co-authored-by: Winlin <winlin@vip.126.com>
 2021-05-28 21:38:52 +08:00