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

5818 commits

Author SHA1 Message Date
winlin
52fb6aed10 Merge 2021-06-20 17:30:59 +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
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
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
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
68c48e27f5 Change GB28181 to feature/gb28181. 4.0.127 2021-06-16 08:27:37 +08:00
winlin
f75ef2f808 Build: Support --shared-ffmpeg 2021-06-01 15:39:37 +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
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
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
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
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
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
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
a9f171144d SquashSRS4: Eliminate dead code 2021-05-24 08:17:59 +08:00
winlin
8e79b90bc3 RTC: Eliminate dead code. 4.0.122 2021-05-24 08:11:42 +08:00
winlin
e50582f9c7 SquashSRS4: Refine SDK 2021-05-21 19:57:59 +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
37c9066636 RTC: Refine sdk, migrate from onaddstream to ontrack. 4.0.120 2021-05-21 16:58:21 +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
9e5c4e2c5b RTC: Fix build fail 2021-05-20 19:56:23 +08:00