1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 19:31:53 +00:00
Commit graph

3561 commits

Author SHA1 Message Date
winlin
a554dd85e1 Fix GCC7 build error, this statement may fall through. 2.0.263 2019-04-05 19:54:32 +08:00
winlin
91c462b6ba For #1339, Support HTTP-FLV params. 2.0.262 2019-04-05 18:16:05 +08:00
YLX
ab833943e1 fix: support parse flv query params to http callback (#1339) 2019-04-05 15:44:00 +08:00
Keegan H
eeffb6d3ff Update README.md (#1317) 2019-02-07 21:01:14 +08:00
winlin
408c2d05ed CI: Update badges 2019-02-02 20:22:49 +08:00
winlin
3e8f070635 CI: Update badges 2019-02-02 20:17:57 +08:00
winlin
b0e91e8fe9 Use docker for #1274 and #1250 2018-12-10 00:05:23 +08:00
winlin
f2a93755c2 Allow OSX for utest 2018-12-09 19:39:36 +08:00
winlin
f1033296bb Upgrade to FFMPEG 4.1 and X264 157. 2.0.261 2018-12-01 20:21:35 +08:00
Steven Liu
78cf3d4b58 upgrade x264 and ffmpeg to newest version (#1274)
The ffmpeg and x264 in srs is too old.

Signed-off-by: Steven Liu lq@chinaffmpeg.org
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2018-11-27 21:17:42 +08:00
winlin
99430d2edb For #1250, Not support macOS 10.14 2018-11-11 16:24:00 +08:00
winlin
99aa249f3a #1261, Support _definst_ for Wowza. 2.0.260 2018-11-11 13:33:47 +08:00
MakarovYaroslav
e62ac29f48 add ignoring _definst_ at the end of app (#1261) 2018-11-11 13:31:29 +08:00
winlin
b2066cbf68 #1263, Fix string trim bug. 2.0.259 2018-11-11 13:30:12 +08:00
MakarovYaroslav
a2480a6c94 fix bug with for loop (#1263) 2018-11-11 13:27:33 +08:00
winlin
4cb8de3029 Release r2.0r5, 2.0.258 2018-10-28 14:18:36 +08:00
winlin
58e501ee24 Fix #1250, Support build on OSX10.14 Mojave. 2.0.258 2018-10-28 14:09:55 +08:00
winlin
a5b452f965 Merge #1236, Fix sleep bug in us. 2.0.257 2018-10-08 07:16:07 +08:00
RocFang
768fe68ca3 fix st_usleep param from us to ms. (#1236)
fix st_usleep param from us to ms.
2018-10-08 07:14:14 +08:00
winlin
9859fa9e6f Merge #1237, Support param for transcoder. 2.0.256 2018-10-08 07:09:31 +08:00
Mirko Velic
70ad16ff6a Add request stream param to encoder output format parameters. (#1237) 2018-10-08 07:01:49 +08:00
winlin
36cebc4b71 Release 2.0r4, 2.0.255 2018-08-12 12:03:31 +08:00
winlin
74a87d54f2 For #1202, Support edge/forward to Aliyun CDN. 2.0.255 2018-08-12 10:44:55 +08:00
winlin
1e7c12a6dd For #910, Support HTTP FLV with HTTP callback. 2.0.254 2018-08-11 19:09:56 +08:00
winlin
6cea551c64 For #1110, Refine params in http callback. 2.0.253 2018-08-11 10:12:40 +08:00
winlin
33f6e9a21f Update readme for FLV realtime 2018-08-05 20:33:45 +08:00
winlin
c45f72ef7b Refine HTTP-FLV latency, support realtime mode. 2.0.252 2018-08-05 20:23:17 +08:00
winlin
ee43fc92ae For #1110, Refine conf 2018-08-05 10:47:01 +08:00
winlin
85d3a5001c For #1110, Support params in http callback. 2.0.251 2018-08-04 19:36:42 +08:00
winlin
09dbda5b18 For #1031, SRS forwarder support douyu.com. 2018-08-02 07:24:08 +08:00
winlin
586899a010 For #1031, SRS edge support douyu.com. 2.0.250 2018-08-02 06:59:57 +08:00
winlin
6d7c7418a8 Merge #1119, fix memory leak. 2.0.249 2018-07-21 17:49:46 +08:00
winlin
5952671689 Release 2.0r3, SRS/2.0.248 2018-07-18 20:27:54 +08:00
winlin
d27db215df For #1176, should not close fd when success. 2018-07-18 19:21:29 +08:00
winlin
2d49b9d1a7 Merge #1176, fix scaned issues. 2.0.248 2018-07-17 13:44:01 +08:00
winlin
dc6b329be3
Merge pull request #1176 from fastfading/2.0release
fix security scan report issue #1172 #1173 #1174 #1175
2018-07-17 13:32:59 +08:00
Hui Zhang (huzhang2)
01ed485cf3 fix #1172 #1173 #1174 #1175
security scan report issue
2018-07-17 10:03:13 +08:00
winlin
0fe17c3e34 Merge #1077, fix crash for edge HLS. 2.0.247 2018-02-28 13:37:30 +08:00
RocFang
fd016ed91a use hls->initialize to set req of hls (#1077) 2018-02-28 13:35:33 +08:00
winlin
1721e4ea4b Fix #1059, support vhost in stream parameters. 2.0.246 2018-02-13 08:31:25 +08:00
winlin
366309ce2d For #1045, revert macro for TCP keepalive detection, use system macro 2018-01-07 17:49:14 +08:00
winlin
911cd448f1 Merge #1045, for #1044, TCP connection alive detection. 2.0.245 2018-01-07 17:18:43 +08:00
juntaoliu
a6871052af set tcp keepalive for tcp socket (#1045) 2018-01-07 17:03:13 +08:00
winlin
a6bc53cb85 Merge #1039, fix bug of init.d script. 2018-01-04 13:49:11 +08:00
RocFang
d22d7afd83 update init.d file (#1039) 2018-01-04 13:45:56 +08:00
winlin
b426036832 Merge #1033, allow user to add some specific flags. 2.0.244 2018-01-01 23:01:13 +08:00
RocFang
015e76cb3f Update configure (#1033)
allow user to add some specific flags.
2018-01-01 22:57:44 +08:00
winlin
a1df3c6f36 Remove CSDN mirror 2017-09-22 16:23:04 +08:00
winlin
baa55f14b9 Change stable release to SRS2 2017-08-19 20:19:35 +08:00
winlin
fe7c1a3e71 Update circle.yml 2017-06-28 12:14:23 +08:00