external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch '4.0release' into merge/develop

Browse source
This commit is contained in:
winlin 2021-06-01 09:35:47 +08:00
commit 71bb8f8a05
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
AUTHORS.txt
View file

@ -1,7 +1,10 @@
CONTRIBUTORS ordered by first contribution. CONTRIBUTORS ordered by first contribution.
* winlin<winlin@vip.126.com> * winlinvip<winlin@vip.126.com>
* chengli.ycl<chengli.ycl@alibaba-inc.com> * winlinvip<winterserver@126.com>
* wenjie.zhao<740936897@qq.com> * winlinvip<chengli.ycl@alibaba-inc.com>
* wenjiegit<zhaowenjie@tal.com>
* wenjiegit<740936897@qq.com>
* wenjiegit<wenjie.zhao@chinacache.com>
* xiangcheng.liu<liuxc0116@foxmail.com> * xiangcheng.liu<liuxc0116@foxmail.com>
* naijia.liu<youngcow@youngcow.net> * naijia.liu<youngcow@youngcow.net>
* alcoholyi<alcoholyi@qq.com> * alcoholyi<alcoholyi@qq.com>
@ -50,32 +53,34 @@ CONTRIBUTORS ordered by first contribution.
* qiang.li<qiang.li@verycdn.com.cn> * qiang.li<qiang.li@verycdn.com.cn>
* HungMingWu<u9089000@gmail.com> * HungMingWu<u9089000@gmail.com>
* Himer<xishizhaohua@qq.com> * Himer<xishizhaohua@qq.com>
* xialixin<xialixin@kanzhun.com>
* xialixin<68469352@qq.com>
* xialixin<xlx0625@163.com> * xialixin<xlx0625@163.com>
* xialixin<xialx@yuntongxun.com>
* alphonsetai<tyh_123@163.com> * alphonsetai<tyh_123@163.com>
* Michael.Ma<wnpllr@gmail.com> * Michael.Ma<wnpllr@gmail.com>
* lam2003<linmin3@yy.com> * lam2003<linmin3@yy.com>
* runner365<shiwei05@kuaishou.com>
* runner365<shi.weibd@hotmail.com> * runner365<shi.weibd@hotmail.com>
* XiaofengWang<wasphin@gmail.com> * XiaofengWang<wasphin@gmail.com>
* XiaLixin<xialx@yuntongxun.com>
* xiaozhihong<xiaozhihong8@gmail.com>
* HuyaJohn<xiaozhihong@huya.com>
* xiaozhihong<hondaxiao@tencent.com> * xiaozhihong<hondaxiao@tencent.com>
* xiaozhihong<xiaozhihong8@gmail.com>
* xiaozhihong<xiaozhihong@huya.com>
* yanghuiwen<cainiaodj@qq.com> * yanghuiwen<cainiaodj@qq.com>
* Bepartofyou<309554135@qq.com> * Bepartofyou<309554135@qq.com>
* pengqiang.wpq<pengqiang.wpq@alibaba-inc.com> * Bepartofyou<pengqiang.wpq@alibaba-inc.com>
* l<22312935+lam2003@users.noreply.github.com> * l<22312935+lam2003@users.noreply.github.com>
* xfalcon<x-falcon@users.noreply.github.com> * xfalcon<x-falcon@users.noreply.github.com>
* chengh_math<chengh_math@126.com> * chen-guanghua<jinxue.cgh@alibaba-inc.com>
* jinxue.cgh<jinxue.cgh@alibaba-inc.com> * chen-guanghua<chengh_math@126.com>
* lipeng19811218<mozhan.lp@alibaba-inc.com>
* lipeng19811218<lipeng19811218@gmail.com> * lipeng19811218<lipeng19811218@gmail.com>
* mozhan.lp<mozhan.lp@alibaba-inc.com>
* yajun18<yajun18@staff.sina.com.cn> * yajun18<yajun18@staff.sina.com.cn>
* liulichuan<liulichuan@kuaishou.com> * liulichuan<liulichuan@kuaishou.com>
* yapingcat<caoyapingneu@163.com> * yapingcat<caoyapingneu@163.com>
* chenchengbin<chenchengbin@yy.com> * chenchengbin<chenchengbin@yy.com>
* chenhaibo<nmgchenhaibo@foxmail.com> * duiniuluantanqin<nmgchenhaibo@foxmail.com>
* jasongwq<jasongwq@gmail.com> * jasongwq<jasongwq@gmail.com>
* xialixin<xialixin@kanzhun.com>
* yinjiaoyuan<yinjiaoyuan@163.com> * yinjiaoyuan<yinjiaoyuan@163.com>
* PieerePi<pihuibin@hotmail.com> * PieerePi<pihuibin@hotmail.com>
* JesseXi<jesse.jinjin@wo.cn> * JesseXi<jesse.jinjin@wo.cn>
@ -85,4 +90,3 @@ CONTRIBUTORS ordered by first contribution.
* johzzy<hellojinqiang@gmail.com> * johzzy<hellojinqiang@gmail.com>
* stone<bluestn@163.com> * stone<bluestn@163.com>
* cfw11<34058899+cfw11@users.noreply.github.com> * cfw11<34058899+cfw11@users.noreply.github.com>
* louis.xia<68469352@qq.com>

3
trunk/scripts/new_authors.sh
View file

@ -7,8 +7,7 @@ authors=`git log --format='%ae'|grep -v localhost|grep -v demo|grep -v none|sort
if [[ $? -ne 0 ]]; then echo "no authors"; exit -1; fi if [[ $? -ne 0 ]]; then echo "no authors"; exit -1; fi
for author in $authors; do for author in $authors; do
echo $author| grep -e "winlin" -e 'winterserver' \ echo $author| grep -e "winlin" -e 'winterserver' >/dev/null 2>&1 && continue;
-e 'zhaowenjie' >/dev/null 2>&1 && continue;
username=$(echo $author |awk -F '@' '{print $1}') username=$(echo $author |awk -F '@' '{print $1}')
grep $username $AFILE 1>/dev/null 2>/dev/null && continue; grep $username $AFILE 1>/dev/null 2>/dev/null && continue;