external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into merge/develop

Browse source
This commit is contained in:
winlin 2021-07-17 19:38:38 +08:00
commit 526c6772c5
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -80,7 +80,7 @@ Other important wiki:
## AUTHORS ## AUTHORS
The [TOC(Technical Oversight Committee)](trunk/AUTHORS.md#toc): The [TOC(Technical Oversight Committee)](trunk/AUTHORS.md#toc) and [contributors](trunk/AUTHORS.md#contributors):
* [Winlin](https://github.com/winlinvip): All areas of streaming server and documents. * [Winlin](https://github.com/winlinvip): All areas of streaming server and documents.
* [Wenjie](https://github.com/wenjiegit): The focus of his work is on the [HDS](https://github.com/simple-rtmp-server/srs/wiki/v4_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/v4_CN_DeliveryHDS) module.
@ -91,7 +91,7 @@ The [TOC(Technical Oversight Committee)](trunk/AUTHORS.md#toc):
* [Mozhan](https://github.com/lipeng19811218): Focus on [WebRTC](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_WebRTC) module. * [Mozhan](https://github.com/lipeng19811218): Focus on [WebRTC](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_WebRTC) module.
* [Jinxue](https://github.com/chen-guanghua): Focus on [WebRTC](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_WebRTC) module. * [Jinxue](https://github.com/chen-guanghua): Focus on [WebRTC](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_WebRTC) module.
A big `THANK YOU` goes to: A big `THANK YOU` also goes to:
* All [contributors](trunk/AUTHORS.md#contributors) of SRS. * All [contributors](trunk/AUTHORS.md#contributors) of SRS.
* All friends of SRS for [big supports](https://github.com/ossrs/srs/wiki/Product). * All friends of SRS for [big supports](https://github.com/ossrs/srs/wiki/Product).

5
trunk/auto/auto_headers.sh
View file

@ -182,11 +182,10 @@ echo "" >> $SRS_AUTO_HEADERS_H
##################################################################################### #####################################################################################
# generated the contributors from AUTHORS.txt # generated the contributors from AUTHORS.txt
##################################################################################### #####################################################################################
if [[ -f AUTHORS.txt ]]; then if [[ -f AUTHORS.md ]]; then
RTMP_SIG_SRS_AUTHORS=`cat AUTHORS.txt|grep "^-"|awk -F '`' '{print $2}'` RTMP_SIG_SRS_AUTHORS=$(cat AUTHORS.md|grep "^-"|awk -F '`' '{print $2}')
echo "#define RTMP_SIG_SRS_AUTHORS \"\\" >> $SRS_AUTO_HEADERS_H echo "#define RTMP_SIG_SRS_AUTHORS \"\\" >> $SRS_AUTO_HEADERS_H
for CONTRIBUTOR in $RTMP_SIG_SRS_AUTHORS; do for CONTRIBUTOR in $RTMP_SIG_SRS_AUTHORS; do
CONTRIBUTOR=`echo $CONTRIBUTOR|sed 's/@users.noreply.github.com>/@github>/g'`
echo "${CONTRIBUTOR} \\" >> $SRS_AUTO_HEADERS_H echo "${CONTRIBUTOR} \\" >> $SRS_AUTO_HEADERS_H
done done
echo "\"" >> $SRS_AUTO_HEADERS_H echo "\"" >> $SRS_AUTO_HEADERS_H