external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity
4422 commits 13 branches 107 tags 375 MiB
Commit graph

3388 commits

Author SHA1 Message Date
winlin
330100769f Always enable SRS_TRANSCODE 2018-12-22 19:48:55 +08:00
winlin
0626bc5982 Use openssl in docker 2018-12-10 14:27:55 +08:00
winlin
432a575c7a Use docker for #1274 and #1250 2018-12-10 00:07:38 +08:00
winlin
b0e91e8fe9 Use docker for #1274 and #1250 2018-12-10 00:05:23 +08:00
winlin
f1ab8fecac Fix build warning 2018-12-09 22:48:47 +08:00
winlin
ef3e35f173 Fix build warning 2018-12-09 21:04:43 +08:00
winlin
4d157f2148 Fix build warning 2018-12-09 21:00:38 +08:00
winlin
dcc2a73e7a Refine kernel aac 2018-12-09 20:58:40 +08:00
winlin
572a2806c1 Refine utest 2018-12-09 20:36:31 +08:00
winlin
a8be5f8f27 Allow OSX for utest 2018-12-09 19:41:59 +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
winlin
acaae0d5c9 Update SRS3 2018-11-27 21:45:57 +08:00
winlin
ba4ef34d27 Merge 2.0release 2018-11-27 21:24:51 +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
ff82ca1233 Merge branch 2.0release into 3.0release 2018-11-11 16:24:09 +08:00
winlin
99430d2edb For #1250, Not support macOS 10.14 2018-11-11 16:24:00 +08:00
winlin
24f46f5085 #1261, Support _definst_ for Wowza. 3.0.44 2018-11-11 13:51:10 +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
39f1629168 Merge from SRS2 2018-10-28 14:24:18 +08:00
winlin
58e501ee24 Fix #1250, Support build on OSX10.14 Mojave. 2.0.258 2018-10-28 14:09:55 +08:00
winlin
63ac93a642 Merge #1236 from 2.0release 2018-10-08 07:22:21 +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
3f009937ee Merge #1237 from 2.0release 2018-10-08 07:10:29 +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
8e55ef4b60 Refine code 2018-08-26 14:29:45 +08:00
winlin
1e2cca4712 For #1093, Refine HLS encryption wiki 2018-08-25 21:59:56 +08:00
winlin
5945fb5a24 Fix #1093, Support HLS encryption. 3.0.42 2018-08-25 21:17:33 +08:00
winlin
ee068cf120 For #1109, Support without ssl for HLS key. 2018-08-25 21:15:26 +08:00
winlin
522fba99aa Merge branch 3.0release into harlanc-3.0release 2018-08-25 18:12:39 +08:00
winlin
e73e30de3a Fix #1051, Drop ts when republishing stream. 3.0.41 2018-08-25 18:10:55 +08:00
winlin
74d5d15c9f Merge branch 3.0release of https://github.com/harlanc/srs into harlanc-3.0release 2018-08-25 12:43:52 +08:00
winlin
1e054d2bcc Fix #354, Rename impl__SrsAutoFree to impl_SrsAutoFree 2018-08-25 12:20:52 +08:00
Harlan
22c5af62cf Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release 
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
 2018-08-15 07:37:12 +08:00
Harlan
bf12a45274 add configuration instructions for hls encryption 2018-08-12 14:18:05 +08:00
Harlan
ac6b37de4b rewrite ff_data_to_hex 2018-08-12 14:10:18 +08:00
winlin
a9b5d65ca7 For #1202, Support auth_key param for srs player 2018-08-12 11:52:18 +08:00
winlin
728ddd133b For #1202, Support edge/forward to Aliyun CDN. 3.0.40 2018-08-12 10:46:06 +08:00
winlin
74a87d54f2 For #1202, Support edge/forward to Aliyun CDN. 2.0.255 2018-08-12 10:44:55 +08:00
winlin
1cc72df134 Fix #910, Support HTTP FLV with HTTP callback. 3.0.39 2018-08-11 19:23:51 +08:00
winlin
1e7c12a6dd For #910, Support HTTP FLV with HTTP callback. 2.0.254 2018-08-11 19:09:56 +08:00
winlin
928c6ab091 For #1181, Add utest 2018-08-11 13:16:59 +08:00
winlin
01d8bba455 For #1181, Refine code to write utest 2018-08-11 12:33:03 +08:00
winlin
6cea551c64 For #1110, Refine params in http callback. 2.0.253 2018-08-11 10:12:40 +08:00
winlin
d607c7f905 Refine HTTP-FLV latency, support realtime mode.3.0.38 2018-08-05 20:30:04 +08:00