diff --git a/AUTHORS.txt b/AUTHORS.txt old mode 100755 new mode 100644 index b148da659..ac4806f57 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,14 +1,17 @@ -Authors ordered by first contribution. +PRIMARY ordered by first contribution. +* winlin "Plan, arch, implement SRS1.0 and SRS2.0" -* winlin -* wenjie.zhao<740936897@qq.com> -* xiangcheng.liu -* naijia.liu -* alcoholyi -* byteman -* chad.wang -* suhetao -* Johnny -* karthikeyan -* StevenLiu -* zhengfl +AUTHORS ordered by first contribution. +* wenjie.zhao<740936897@qq.com> "The bandwidth test module" + +CONTRIBUTORS ordered by first contribution. +* xiangcheng.liu "Bug fixed" +* naijia.liu "Performance benchmark" +* alcoholyi "Bug fixed" +* byteman "Bug fixed" +* chad.wang "Bug fixed" +* suhetao "Bug fixed" +* Johnny "Create domain ossrs.net" +* karthikeyan "Bug fixed" +* StevenLiu "Build SRS on Darwin OSX" +* zhengfl "Bug fixed" diff --git a/README.md b/README.md index b2170490c..d8a28b341 100755 --- a/README.md +++ b/README.md @@ -162,19 +162,17 @@ StreamServers:[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https [FMS/AMS](http://www.adobe.com/products/adobe-media-server-standard.html) ## AUTHORS -The PRIMARY AUTHORS are (and/or have been)(Authors ordered by first contribution): -* winlin([winterserver](#)): [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin) -* wenjie([wenjiegit](https://github.com/wenjiegit/simple-rtmp-server)): [http://blog.chinaunix.net/uid/25006789.html](http://blog.chinaunix.net/uid/25006789.html) -About the primary AUTHORS: -* Contribute important features to SRS. -* Names of all PRIMARY AUTHORS response in NetConnection.connect and metadata. -* Names of all CONTRIBUTORS response in api/v1/authors. +There are three types of people that have contributed to the SRS project: +* PRIMARY: Contribute important features and >10% code. Names of all +PRIMARY response in NetConnection.connect and metadata. +* AUTHORS: Contribute features and 1%~10% code. Names of all +PRIMARY response in NetConnection.connect and metadata. +* CONTRIBUTORS: Submit patches, report bugs, add translations, help answer +newbie questions, and generally make SRS that much better. -And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS -- -people who have submitted patches, reported bugs, added translations, helped -answer newbie questions, and generally made SRS that much better: -[AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt) +About all PRIMARY, AUTHORS and CONTRIBUTORS, read +[AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt). A big THANK YOU goes to: * [chnvideo](chnvideo.com) co-founders([wiseyoung](mailto:wiseyoung@chnvideo.com), [trueice](mailto:trueice@chnvideo.com), [leijian](mailto:leijian@chnvideo.com)) for [big supports](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#bigthanks).