external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'srs.master'

Browse source
This commit is contained in:
winlin 2014-11-25 10:18:06 +08:00
commit 5a4c5f0f59
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
AUTHORS.txt
View file

@ -1,17 +1,17 @@
PRIMARY ordered by first contribution.
* winlin<winlin@vip.126.com>
* winlin<winlin@vip.126.com> "Plan, arch, implement SRS1.0 and SRS2.0"
AUTHORS ordered by first contribution.
* wenjie.zhao<740936897@qq.com>
* wenjie.zhao<740936897@qq.com> "The bandwidth test module"
CONTRIBUTORS ordered by first contribution.
* xiangcheng.liu<liuxc0116@foxmail.com>
* naijia.liu<youngcow@youngcow.net>
* alcoholyi<alcoholyi@qq.com>
* byteman<wangchen2011@gmail.com>
* chad.wang<chad.wang.cn@gmail.com>
* suhetao<suhetao@gmail.com>
* Johnny<fengjihu@163.com>
* karthikeyan<keyanmca@gmail.com>
* StevenLiu<lq@chinaffmpeg.org>
* zhengfl<zhengfl_1989@126.com>
* xiangcheng.liu<liuxc0116@foxmail.com> "Bug fixed"
* naijia.liu<youngcow@youngcow.net> "Performance benchmark"
* alcoholyi<alcoholyi@qq.com> "Bug fixed"
* byteman<wangchen2011@gmail.com> "Bug fixed"
* chad.wang<chad.wang.cn@gmail.com> "Bug fixed"
* suhetao<suhetao@gmail.com> "Bug fixed"
* Johnny<fengjihu@163.com> "Create domain ossrs.net"
* karthikeyan<keyanmca@gmail.com> "Bug fixed"
* StevenLiu<lq@chinaffmpeg.org> "Build SRS on Darwin OSX"
* zhengfl<zhengfl_1989@126.com> "Bug fixed"