Commit Graph

4387 Commits (37bc0a253df2506bd5e66b9f5b28a7a22428e7e3)
 

Author SHA1 Message Date
winlin 37bc0a253d Merge branch harlanc-3.0release into 3.0release 7 years ago
winlin 5945fb5a24 Fix #1093, Support HLS encryption. 3.0.42 7 years ago
winlin ee068cf120 For #1109, Support without ssl for HLS key. 7 years ago
winlin 522fba99aa Merge branch 3.0release into harlanc-3.0release 7 years ago
winlin e73e30de3a Fix #1051, Drop ts when republishing stream. 3.0.41 7 years ago
winlin 74d5d15c9f Merge branch 3.0release of https://github.com/harlanc/srs into harlanc-3.0release 7 years ago
winlin 1e054d2bcc Fix #354, Rename impl__SrsAutoFree to impl_SrsAutoFree 7 years ago
Harlan 22c5af62cf Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
7 years ago
Harlan bf12a45274 add configuration instructions for hls encryption 7 years ago
Harlan ac6b37de4b rewrite ff_data_to_hex 7 years ago
winlin a61bfb2066 Merge 2.0r4 7 years ago
winlin 36cebc4b71 Release 2.0r4, 2.0.255 7 years ago
winlin a9b5d65ca7 For #1202, Support auth_key param for srs player 7 years ago
winlin 728ddd133b For #1202, Support edge/forward to Aliyun CDN. 3.0.40 7 years ago
winlin 74a87d54f2 For #1202, Support edge/forward to Aliyun CDN. 2.0.255 7 years ago
winlin 1cc72df134 Fix #910, Support HTTP FLV with HTTP callback. 3.0.39 7 years ago
winlin 1e7c12a6dd For #910, Support HTTP FLV with HTTP callback. 2.0.254 7 years ago
winlin 928c6ab091 For #1181, Add utest 7 years ago
winlin 01d8bba455 For #1181, Refine code to write utest 7 years ago
winlin c582590bb0 For #1110, Refine params in http callback. 2.0.253 7 years ago
winlin 6cea551c64 For #1110, Refine params in http callback. 2.0.253 7 years ago
winlin 0e1ddb046d Update readme for FLV realtime 7 years ago
winlin 33f6e9a21f Update readme for FLV realtime 7 years ago
winlin d607c7f905 Refine HTTP-FLV latency, support realtime mode.3.0.38 7 years ago
winlin 03ac48f8fa Merge 2.0, for FLV latency 7 years ago
winlin c45f72ef7b Refine HTTP-FLV latency, support realtime mode. 2.0.252 7 years ago
winlin 580c94c8c0 Refine code 7 years ago
winlin 31945c244d For #1110, Refine code. 7 years ago
winlin 455a060fa5 Merge 2.0 7 years ago
winlin ee43fc92ae For #1110, Refine conf 7 years ago
winlin ae99131512 Fix #1087, Ignore iface without address. 3.0.37 7 years ago
winlin 82699ff616 Refine code for librtmp 7 years ago
winlin 29b74c7220 For #1110, Support params in http callback. 3.0.36 7 years ago
winlin 85d3a5001c For #1110, Support params in http callback. 2.0.251 7 years ago
winlin 68a1656e07 Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35 7 years ago
winlin 8cf5df5afb Merge 2.0release 7 years ago
winlin 09dbda5b18 For #1031, SRS forwarder support douyu.com. 7 years ago
winlin a66d450ec1 For #1031, SRS edge support douyu.com. 3.0.34 7 years ago
winlin 586899a010 For #1031, SRS edge support douyu.com. 2.0.250 7 years ago
winlin 41c6e833b9 Replace hex to string to match MIT license. 3.0.33 7 years ago
winlin 84f81983aa Replace base64 to match MIT license. 3.0.32 7 years ago
winlin 0a63448b86 Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31 7 years ago
winlin e395878916 Replace crc32 IEEE by golang to match MIT license. 3.0.30 7 years ago
winlin dea5e5bb48 Add utest or CRC32 IEEE, refine TABs of code 7 years ago
winlin 608c88b8f2 Merge 2.0release 7 years ago
winlin 6d7c7418a8 Merge #1119, fix memory leak. 2.0.249 7 years ago
winlin 551863a7ed Refine code 7 years ago
winlin f5c4d5a539 Release 2.0r3, SRS/2.0.248 7 years ago
winlin 5952671689 Release 2.0r3, SRS/2.0.248 7 years ago
winlin 693194dffe Merge 2.0release 7 years ago