github.com/ossrs/srs commits | Ecosyste.ms: OpenCollective

Use docker for #1274 and #1250

432a575c7ae7ab6969069cf0461cdf2cfa79840f authored about 6 years ago

Use docker for #1274 and #1250

b0e91e8fe91f99ccd22287c17cc95677432adaf0 authored about 6 years ago

Fix build warning

f1ab8fecac43b2ee4243471b2d4150d8f3824300 authored about 6 years ago

Fix build warning

ef3e35f173cfdfd07fa6da34ec66d812a126678f authored about 6 years ago

Fix build warning

4d157f214843319cd7d916f4b71729bce46d4997 authored about 6 years ago

Refine kernel aac

dcc2a73e7aab5dc91f0fcc6cf13e4cda7ec8edc5 authored about 6 years ago

Refine utest

572a2806c1a0d30c04ad8353dc9768d029b31c5c authored about 6 years ago

Allow OSX for utest

a8be5f8f274d8c9fa51750e44e1d9ff1fa027eea authored about 6 years ago

Allow OSX for utest

f2a93755c26b56ccb623906168ad16529664558b authored about 6 years ago

Upgrade to FFMPEG 4.1 and X264 157. 2.0.261

f1033296bbdeb068e895fab550a02d83c7371767 authored about 6 years ago

Update SRS3

acaae0d5c996be91d097a14bd1be680f71ea57e2 authored about 6 years ago

Merge 2.0release

ba4ef34d279354cd40964d74dde7abf19f50f83f authored about 6 years ago

upgrade x264 and ffmpeg to newest version (#1274)

The ffmpeg and x264 in srs is too old.

Signed-off-by: Steven Liu [email protected]
Signed-o...

78cf3d4b584f5537cd05d1ae33a70125a4fea3c3 authored about 6 years ago

Merge branch 2.0release into 3.0release

ff82ca123351a471c613e4491fe36ba7a78449f7 authored about 6 years ago

For #1250, Not support macOS 10.14

99430d2edbcf7eb1895a9011003fdabe6c7a4be5 authored about 6 years ago

#1261, Support _definst_ for Wowza. 3.0.44

24f46f5085da0d02f851af718a2d124d8f412fa5 authored about 6 years ago

#1261, Support _definst_ for Wowza. 2.0.260

99aa249f3a336e19760329bab3d8c9db7de02d9b authored about 6 years ago

add ignoring _definst_ at the end of app (#1261)

e62ac29f4859dceb87d6967eb561b461a4915a78 authored about 6 years ago

#1263, Fix string trim bug. 2.0.259

b2066cbf683847b8f49c6e4134d3b1f26b711e60 authored about 6 years ago

fix bug with for loop (#1263)

a2480a6c94bc523e6d15108dbd70cf9ac7829dfe authored about 6 years ago

Merge from SRS2

39f1629168a604db3c47b8185e42f61d7976ea0d authored over 6 years ago

Release r2.0r5, 2.0.258

4cb8de3029b4a0f1b2578def6be7771b926ddfa9 authored over 6 years ago

Fix #1250, Support build on OSX10.14 Mojave. 2.0.258

58e501ee241c59bff42b8ca755357833a876daab authored over 6 years ago

Merge #1236 from 2.0release

63ac93a64208a0aa3e7bfd2b1e01f7db11d1f3cb authored over 6 years ago

Merge #1236, Fix sleep bug in us. 2.0.257

a5b452f9650350829aa20151551e9092537f9128 authored over 6 years ago

fix st_usleep param from us to ms. (#1236)

fix st_usleep param from us to ms.

768fe68ca3e16434b54fa3b0fdc69e004fe8dce3 authored over 6 years ago

Merge #1237 from 2.0release

3f009937eef3ef3c7690c1513d44c9c090fee4c8 authored over 6 years ago

Merge #1237, Support param for transcoder. 2.0.256

9859fa9e6ffe968da7cd59d3b236ff19871441f4 authored over 6 years ago

Add request stream param to encoder output format parameters. (#1237)

70ad16ff6a50df1dbcbfd81207870ed273770215 authored over 6 years ago

SRS console support both Chinese and English

580b94c9c8181f05f57222b2620e1769971e1281 authored over 6 years ago

Refine code

8e55ef4b606ce115fef12a68cbbac164f6bc8920 authored over 6 years ago

For #1093, Refine HLS encryption wiki

1e2cca4712b5de6304d397bdf25e85a72e3975aa authored over 6 years ago

Merge branch harlanc-3.0release into 3.0release

37bc0a253df2506bd5e66b9f5b28a7a22428e7e3 authored over 6 years ago

Fix #1093, Support HLS encryption. 3.0.42

5945fb5a244eabb2431953eba381efea8c8448d5 authored over 6 years ago

For #1109, Support without ssl for HLS key.

ee068cf1207bf72fde4395598aa78eb1218b9bc0 authored over 6 years ago

Merge branch 3.0release into harlanc-3.0release

522fba99aa0bd60e1b7bbe4a29b24562010e08b6 authored over 6 years ago

Fix #1051, Drop ts when republishing stream. 3.0.41

e73e30de3ac26699d5b2b7f149ef65d3539a5814 authored over 6 years ago

Merge branch 3.0release of https://github.com/harlanc/srs into harlanc-3.0release

74d5d15c9f258bffd5c2332ff7193aed253ee55a authored over 6 years ago

Fix #354, Rename impl__SrsAutoFree to impl_SrsAutoFree

1e054d2bcc21b9db332b6216eaba9763d42d4a25 authored over 6 years ago

Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release

# Conflicts:
# trunk/src/kernel/srs_kernel_utility.hpp

22c5af62cfa935785aadaa8220946d67a5b4cc1b authored over 6 years ago

add configuration instructions for hls encryption

bf12a452745e30e3d2e18785b8caa19f417ffeae authored over 6 years ago

rewrite ff_data_to_hex

ac6b37de4b10d105bb78ab5cd0d8fa176ec0e7eb authored over 6 years ago

Merge 2.0r4

a61bfb2066e46ef89f952f35979b531dc0d15689 authored over 6 years ago

Release 2.0r4, 2.0.255

36cebc4b71a867accb4acf3b446265d2df4964b6 authored over 6 years ago

For #1202, Support auth_key param for srs player

a9b5d65ca747aa59f1ec9993703e56d9d466db87 authored over 6 years ago

For #1202, Support edge/forward to Aliyun CDN. 3.0.40

728ddd133b69419517edb19496669f3359ffa7db authored over 6 years ago

For #1202, Support edge/forward to Aliyun CDN. 2.0.255

74a87d54f2cdf9d298a7e1f2b3a67551d56af9de authored over 6 years ago

Fix #910, Support HTTP FLV with HTTP callback. 3.0.39

1cc72df134bf3fce0b6193ecf863be0770b4d876 authored over 6 years ago

For #910, Support HTTP FLV with HTTP callback. 2.0.254

1e7c12a6dd32d0c15609a18a5a4840e563d6892a authored over 6 years ago

For #1181, Add utest

928c6ab091edbe4fafc6e0da4042ab8ac874ac5e authored over 6 years ago

For #1181, Refine code to write utest

01d8bba45562d891ab8652844b8f768fcf74a003 authored over 6 years ago

For #1110, Refine params in http callback. 2.0.253

c582590bb0a9793ed6cd2a922df030016dc539ad authored over 6 years ago

For #1110, Refine params in http callback. 2.0.253

6cea551c64b09ac840c364fec31f25034a0109c2 authored over 6 years ago

Update readme for FLV realtime

0e1ddb046deeebd401ccbeb1e91361e6aef32165 authored over 6 years ago

Update readme for FLV realtime

33f6e9a21fedacd9af78d4c436103ffa96f6ae3f authored over 6 years ago

Refine HTTP-FLV latency, support realtime mode.3.0.38

d607c7f90598d3c677eec8620ed793b3fe5d1488 authored over 6 years ago

Merge 2.0, for FLV latency

03ac48f8fad733aaf48a6c464ecb8da1cef6922e authored over 6 years ago

Refine HTTP-FLV latency, support realtime mode. 2.0.252

c45f72ef7bac9c7cf85b9125fc9e3aafd53f396f authored over 6 years ago

Refine code

580c94c8c0f03e05ca5460a2e4d68505fe6e7ba2 authored over 6 years ago

For #1110, Refine code.

31945c244d1f9c0214a251134f1f3cae60c22697 authored over 6 years ago

Merge 2.0

455a060fa5c9c7e204195675cbadc5c21eee0eed authored over 6 years ago

For #1110, Refine conf

ee43fc92ae99eb32c315c81e744c4530717542e1 authored over 6 years ago

Fix #1087, Ignore iface without address. 3.0.37

ae99131512be52ab866a393d2c1c6788a873dd15 authored over 6 years ago

Refine code for librtmp

82699ff616a49e878afe6171c6b7466477a215c2 authored over 6 years ago

For #1110, Support params in http callback. 3.0.36

29b74c7220a8e8611eebc6975c1d786b0b2572e5 authored over 6 years ago

For #1110, Support params in http callback. 2.0.251

85d3a5001c3db244cabad01da2fe3eebb7936925 authored over 6 years ago

Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35

68a1656e0780a504e0e9bc1ce97d0c33fa22738f authored over 6 years ago

Merge 2.0release

8cf5df5afb24093bfd26f5b48be6c6d658c79796 authored over 6 years ago

For #1031, SRS forwarder support douyu.com.

09dbda5b186a6fd7e99faf05426c4274e975dc85 authored over 6 years ago

For #1031, SRS edge support douyu.com. 3.0.34

a66d450ec1392fab2ef461dff2605e314284acce authored over 6 years ago

For #1031, SRS edge support douyu.com. 2.0.250

586899a01016bffcef16977f202eed8ad27643a0 authored over 6 years ago

Replace hex to string to match MIT license. 3.0.33

41c6e833b99829be4929f5bc90f83a237ccf7c33 authored over 6 years ago

Replace base64 to match MIT license. 3.0.32

84f81983aa609d2027e290c808280428a4e69f0e authored over 6 years ago

Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31

0a63448b86bfa2998f14055402896406a33de109 authored over 6 years ago

Replace crc32 IEEE by golang to match MIT license. 3.0.30

e3958789165663eb74fd69e27e302c81d61821bb authored over 6 years ago

Add utest or CRC32 IEEE, refine TABs of code

dea5e5bb48ace08c56503bede194cb731ca4ecb9 authored over 6 years ago

Merge 2.0release

608c88b8f2b352cdbce3b89b9042026ea907e2d3 authored over 6 years ago

Merge #1119, fix memory leak. 2.0.249

6d7c7418a8a21fdfa41a0c023a1bae29ce08b95b authored over 6 years ago

Refine code

551863a7ed115654097e425df792cd8768954a50 authored over 6 years ago

Release 2.0r3, SRS/2.0.248

f5c4d5a539c856a0cca56b959beae157d95d3226 authored over 6 years ago

Release 2.0r3, SRS/2.0.248

595267168916222d4eb28bb420bf98bff6de6b73 authored over 6 years ago

Merge 2.0release

693194dffe98740f203470d4ba43951f0f47e7db authored over 6 years ago

For #1176, should not close fd when success.

d27db215df883d050f964b8d2990416bd36d04fb authored over 6 years ago

Merge 2.0release

e4742ddac7b1faf8c227b9efe50f05918c4f92bd authored over 6 years ago

Merge #1176, fix scaned issues. 2.0.248

2d49b9d1a734a348f9f646ab4bf69831740bf69c authored over 6 years ago

Merge pull request #1176 from fastfading/2.0release

fix security scan report issue #1172 #1173 #1174 #1175

dc6b329be3cd12fdd68b8b71c4dffbfe00537ac4 authored over 6 years ago

fix #1172 #1173 #1174 #1175

security scan report issue

01ed485cf373ffc2424644203ec50e90f019cc6c authored over 6 years ago

fix default value error

e9cb8210fc4e6d8151f22a6775128799069970c2 authored over 6 years ago

CI test

90f70d4cd3ae1cf44b376fc8b2384bab7e1649a4 authored almost 7 years ago

fix bug

45a57acbb452a8b2d071175c47b25b2df57bfb14 authored almost 7 years ago

fix bug that only one stream can be encrypted..

43ebd5958dbf65f2fdac98f8b01812d67ae3b0a2 authored almost 7 years ago

Merge branch 'develop' into 3.0release

dba44c7c3fe294e0cd52c0330e77439a9c30a3a3 authored almost 7 years ago

fix create dir success result check (#1080)

bb4e16ae3c9d39e0de8ea8e7c6195171e1799071 authored almost 7 years ago

add: hls configuration adds [duration] variable (#1083)

aaf2905a9dfacbcdc96013a4646ce628ac4ca638 authored almost 7 years ago

add HLS encryption feature

52596a0b046f699a0f36a283aced88f83eb56588 authored almost 7 years ago

Fix client tools resolve dns failed bug

0d78b908a7ea446b382db9e55135d42a53155440 authored almost 7 years ago

Refine readme

c20b819a29a85f520f8cf3cb9562a7aab003ce1b authored almost 7 years ago

For #464: Add example for origin cluster

449c632e490f0f155fcdad01d545585fae126e75 authored almost 7 years ago

Fix utest build failed for ::atoi

bd797ad385be2a6848a46554da6aaa2245aba7c6 authored almost 7 years ago

Merge #1077 from 2.0release

459272b94cbdf6a329efebc0dfb5876d496a7f93 authored almost 7 years ago