external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-24 06:54:22 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into min

Browse source
This commit is contained in:
winlin 2020-02-16 14:11:56 +08:00
commit 689cfe2a11
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

@ -1103,20 +1103,20 @@ Remark:
There are two types of people that have contributed to the SRS project: There are two types of people that have contributed to the SRS project:
* Maintainers: Contribute important features. Names of all authors responsed in NetConnection.connect and metadata. * Maintainers: Contribute and maintain important features. SRS always remembers and thanks you by writing your names in stream metadata.
* [Contributors][authors]: Submit patches, report bugs, add translations, help answer newbie questions, and generally make SRS much better. * [Contributors][authors]: Submit patches, report bugs, add translations, help answer newbie questions, and generally make SRS much better.
Maintainers of SRS project: Maintainers of SRS project:
* Winlin: All areas of streaming server and documents. * [Winlin](https://github.com/winlinvip): All areas of streaming server and documents.
* Wenjie: The focus of his work is on the [HDS](https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHDS) module. * [Wenjie](https://github.com/wenjiegit): The focus of his work is on the [HDS](https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHDS) module.
* Runner365: The focus of his work is on the [SRT](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_SRTWiki) module. * [Runner365](https://github.com/runner365): The focus of his work is on the [SRT](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_SRTWiki) module.
A big THANK YOU goes to: A big THANK YOU goes to:
* All friends of SRS for [big supports][bigthanks]. * All friends of SRS for [big supports][bigthanks].
* Genes amd Mabbott for creating [st][st]([state-threads][st2]). * Genes amd Mabbott for creating [st][st]([state-threads][st2]).
* Michael Talyanksy for introducing ST to us. * [Michael Talyanksy](https://github.com/michaeltalyansky) for introducing ST to us.
## Mirrors ## Mirrors
@ -1189,8 +1189,8 @@ Winlin
[authors]: https://github.com/ossrs/srs/blob/develop/AUTHORS.txt [authors]: https://github.com/ossrs/srs/blob/develop/AUTHORS.txt
[bigthanks]: https://github.com/ossrs/srs/wiki/v1_CN_Product#bigthanks [bigthanks]: https://github.com/ossrs/srs/wiki/v1_CN_Product#bigthanks
[st]: https://github.com/winlinvip/state-threads [st]: https://github.com/winlinvip/state-threads
[st2]: http://sourceforge.net/projects/state-threads/ [st2]: https://github.com/ossrs/state-threads/tree/srs
[state-threads]: http://sourceforge.net/projects/state-threads/ [state-threads]: https://github.com/ossrs/state-threads/tree/srs
[nginx-rtmp]: https://github.com/arut/nginx-rtmp-module [nginx-rtmp]: https://github.com/arut/nginx-rtmp-module
[http-parser]: https://github.com/joyent/http-parser [http-parser]: https://github.com/joyent/http-parser
[nginx]: http://nginx.org/ [nginx]: http://nginx.org/