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

7302 commits

Author SHA1 Message Date
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
louis.xia
cc52e5b27c
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:12 +08:00
cfw11
3e7536c493 GB28181: fix parse rtp-tcp failed (#2378)
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
2021-05-28 21:20:41 +08:00
cfw11
4d6f00e6bf
GB28181: fix parse rtp-tcp failed (#2378)
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
2021-05-28 21:19:05 +08:00
winlin
f270d42849 Update README.md 2021-05-27 13:44:46 +08:00
winlin
295ef90815 SRS: Update README.md 2021-05-27 11:13:31 +08:00
winlin
c353f1fe57 Update Usage 2021-05-26 14:21:23 +08:00
winlin
bd1ec99d5b Demo: Update srs.sdk.js 2021-05-25 16:04:44 +08:00
winlin
463105c012 Refine README.md 2021-05-25 14:39:47 +08:00
winlin
bbd7ee08d4 Update README.md 2021-05-24 15:19:49 +08:00
winlin
4cfde4fa08 Merge 2021-05-24 15:19:06 +08:00
winlin
a00bb76d13 Merge branch 'develop' into merge/develop 2021-05-24 15:18:10 +08:00
winlin
3cdd1c4e66 Update README.md 2021-05-24 15:12:36 +08:00
winlin
7fcafef6c4 Refine README.md 2021-05-24 14:45:19 +08:00
winlin
a9f171144d SquashSRS4: Eliminate dead code 2021-05-24 08:17:59 +08:00
winlin
3e1b9a545c Merge 2021-05-24 08:17:14 +08:00
winlin
9d2e5a7333 Merge branch '4.0release' into merge/develop 2021-05-24 08:16:50 +08:00
winlin
8e79b90bc3 RTC: Eliminate dead code. 4.0.122 2021-05-24 08:11:42 +08:00
winlin
5afa8edd01 Update README, eliminate unused wikis. 2021-05-21 20:32:10 +08:00
winlin
e50582f9c7 SquashSRS4: Refine SDK 2021-05-21 19:57:59 +08:00
winlin
f42acb4c48 Merge branch '4.0release' into merge/develop 2021-05-21 19:57:23 +08:00
winlin
da7413d5e0 Merge branch 'develop' into merge/develop 2021-05-21 19:57:19 +08:00
winlin
5df90a2a1c Fix #2370 bug for Firefox play stream(published by Chrome). 4.0.121 2021-05-21 18:56:19 +08:00
winlin
7ea05dddf2 RTC: Allow set constrain for publisher 2021-05-21 18:32:53 +08:00
winlin
9ed388523f RTC: Refine demo H5 page 2021-05-21 17:26:52 +08:00
winlin
a7ab78a588 SquashSRS4: Update SDK 2021-05-21 17:14:04 +08:00
winlin
586bbf9f53 Merge branch '4.0release' into merge/develop 2021-05-21 17:13:08 +08:00
winlin
3b3615bb17 Merge branch 'develop' into merge/develop 2021-05-21 17:13:04 +08:00
winlin
37c9066636 RTC: Refine sdk, migrate from onaddstream to ontrack. 4.0.120 2021-05-21 16:58:21 +08:00
winlin
c5c0a3e1b0 Refine doc 2021-05-21 09:19:17 +08:00
winlin
1ba0b20b74 Refine commens 2021-05-21 08:48:19 +08:00
winlin
0c1e60c8df Tools: Refine configure options. 4.0.119 2021-05-21 08:31:10 +08:00
winlin
6dc8d9dd6f SquashSRS4: Remove srs-librtmp 2021-05-20 20:07:13 +08:00
winlin
365b367ad4 Merge branch '4.0release' into merge/develop 2021-05-20 20:06:30 +08:00
winlin
9e5c4e2c5b RTC: Fix build fail 2021-05-20 19:56:23 +08:00
winlin
a01e2d062c Merge branch '4.0release' into merge/develop 2021-05-20 19:09:19 +08:00
winlin
7482aaf60a Merge branch 'develop' into merge/develop 2021-05-20 19:09:16 +08:00