winlin
|
d2a4e08ba0
|
Merge
|
2021-06-16 13:39:22 +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
|
dbe7779fc8
|
Merge branch '4.0release' into merge/develop
|
2021-06-01 15:38:42 +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
|
9e9aaa8ed9
|
Merge branch '4.0release' into merge/develop
|
2021-06-01 12:28:23 +08:00 |
|
winlin
|
8434271578
|
Build: Refine configure option help
|
2021-06-01 11:44:14 +08:00 |
|
winlin
|
586bbf9f53
|
Merge branch '4.0release' into merge/develop
|
2021-05-21 17:13:08 +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
|
a01e2d062c
|
Merge branch '4.0release' into merge/develop
|
2021-05-20 19:09:19 +08:00 |
|
winlin
|
af04285baa
|
Tools: Remove srs-librtmp
|
2021-05-20 18:52:21 +08:00 |
|
winlin
|
3fb6433c9e
|
Tools: Ignore some unused options
|
2021-05-20 18:31:00 +08:00 |
|
winlin
|
55baa81cea
|
Tools: Refine --arm with --rtc=off
|
2021-05-20 18:20:52 +08:00 |
|
winlin
|
d8e41cd283
|
Merge branch '4.0release' into merge/develop
|
2021-05-16 13:50:08 +08:00 |
|
hondaxiao
|
90f1b482ab
|
SRT: Build SRT from source by SRS. 4.0.115
|
2021-05-16 08:23:26 +08:00 |
|
winlin
|
f5c9996c59
|
Merge
|
2021-04-24 19:40:33 +08:00 |
|
winlin
|
5232f9e043
|
Disable CherryPy by --cherrypy=off. 4.0.90
|
2021-04-24 19:26:24 +08:00 |
|
winlin
|
3bb1b673c5
|
Merge SRS4, lots of features
|
2021-03-04 14:49:03 +08:00 |
|
winlin
|
212ff6fc2d
|
Never force to openssl-1.0 for asm and srtp-asm, because openssl-1.1+libsrtp-2.3 is ok now
|
2021-03-04 14:18:50 +08:00 |
|
winlin
|
cec588e08a
|
For #2188: Remove sendmmsg from ST.
|
2021-03-02 19:31:33 +08:00 |
|
winlin
|
34dae0fe0d
|
For #2188: Remove sendmmsg from ST.
|
2021-02-26 09:13:21 +08:00 |
|
winlin
|
1f621a6db3
|
Remove dead code: memory watch
|
2021-02-19 18:53:40 +08:00 |
|
winlin
|
c6cb0fb21f
|
Refine scripts
|
2021-02-19 18:53:37 +08:00 |
|
winlin
|
0fe031a156
|
Support to disable stats by default
|
2021-02-19 18:53:34 +08:00 |
|
winlin
|
4ef1acb700
|
Remove dead code: memory watch
|
2021-02-15 19:33:40 +08:00 |
|
winlin
|
0898a1a7ea
|
Refine scripts
|
2021-02-15 19:24:23 +08:00 |
|
winlin
|
25be6d6bc0
|
Support to disable stats by default
|
2021-02-15 13:09:13 +08:00 |
|
winlin
|
3fa767f3cc
|
Build: Support --ssl-local to rebuild openssl even system exists
|
2021-01-31 18:07:39 +08:00 |
|
winlin
|
6e3bd61599
|
Enable --nasm and --srtp-asm by default for performance. 4.0.64
|
2021-01-31 18:07:20 +08:00 |
|
winlin
|
0fe85a295c
|
Refine options with default value
|
2021-01-31 18:05:26 +08:00 |
|
winlin
|
b9a5d4beb6
|
Refine options with default value
|
2021-01-31 18:05:07 +08:00 |
|
winlin
|
73c4b1cb6e
|
RTC: Enable -std=c++11 by default. 4.0.65
|
2021-01-31 14:54:51 +08:00 |
|
winlin
|
849703bca1
|
Build: Support --ssl-local to rebuild openssl even system exists
|
2021-01-26 17:54:44 +08:00 |
|
winlin
|
f6720c18c6
|
Enable --nasm and --srtp-asm by default for performance. 4.0.64
|
2021-01-25 22:23:42 +08:00 |
|
winlin
|
0c56d11605
|
Refine options with default value
|
2021-01-18 17:32:14 +08:00 |
|
winlin
|
1371a47962
|
Refine options with default value
|
2021-01-18 17:28:51 +08:00 |
|
winlin
|
f8266fe3b7
|
Add usage for --cherrypy=on|off when configure
|
2021-01-07 18:02:24 +08:00 |
|
winlin
|
18d049accc
|
Support disable CherryPy. 4.0.57
|
2020-12-24 11:33:49 +08:00 |
|
winlin
|
d2df045d0e
|
For #1657, enable HTTPS by default
|
2020-11-03 16:56:05 +08:00 |
|
winlin
|
d552a1a5fb
|
For #1657, support HTTPS client, for http-callback. 4.0.45
|
2020-11-03 15:45:52 +08:00 |
|
winlin
|
a51e275414
|
Merge SRS3
|
2020-10-23 21:35:13 +08:00 |
|
winlin
|
6dc3d85ded
|
Allow FFmpeg if exists at /usr/local/bin/ffmpeg. 3.0.147
|
2020-10-23 21:32:57 +08:00 |
|
winlin
|
8860d0ec62
|
RTC: Refine options
|
2020-08-28 11:19:21 +08:00 |
|
winlin
|
994c53b6c1
|
Merge branch '4.0release' into develop
|
2020-08-06 12:08:46 +08:00 |
|
winlin
|
4984bcbaef
|
Revert "supprot LAS(live adaptive stream)"
This reverts commit c1f98ddcc8 .
|
2020-08-06 12:02:32 +08:00 |
|
winlin
|
b847a0a218
|
BUILD: Compatible with 3.0 options, ignore it
|
2020-08-03 19:31:14 +08:00 |
|
winlin
|
0905558d49
|
BUILD: Compatible with 3.0 options, ignore it
|
2020-08-03 19:28:52 +08:00 |
|
winlin
|
8ae3ab0ba7
|
Merge SRS 4.0
|
2020-07-19 10:09:28 +08:00 |
|
winlin
|
bff7ef085d
|
Log: Allow log verbose and info
|
2020-07-05 22:01:03 +08:00 |
|