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
92327b6e20 Merge branch 'develop' into merge/develop 2021-06-20 17:26:10 +08:00
winlin
efdbf37255 Squash: Move GB28181 to feature/gb28181. 5.0.4 2021-06-16 14:03:55 +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
9932ad83b6 Merge branch 'develop' into merge/develop 2021-06-16 13:43:35 +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
d2a4e08ba0 Merge 2021-06-16 13:39:22 +08:00
winlin
2e3443c84a Merge branch 'develop' into merge/develop 2021-06-16 13:38:47 +08:00
winlin
863f91ddb4 Fix build fail 2021-06-16 08:43:33 +08:00
winlin
68c48e27f5 Change GB28181 to feature/gb28181. 4.0.127 2021-06-16 08:27:37 +08:00
winlin
49826081b1 Squash: Update README 2021-06-15 16:11:29 +08:00
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