正在显示
2 个修改的文件
包含
14 行增加
和
9 行删除
| 1 | #Simple-RTMP-Server | 1 | #Simple-RTMP-Server |
| 2 | 2 | ||
| 3 | -You can [Download Released SRS(下载发布版)](http://winlinvip.github.io/srs.release/releases/) | 3 | +[下载发布版(github): Download Released SRS from github](http://winlinvip.github.io/srs.release/releases/) |
| 4 | 4 | ||
| 5 | -Or download from [chnvideo mirror(国内镜像)](http://demo.chnvideo.com:8085/srs/releases/) | 5 | +[下载发布版(国内阿里云镜像): Download Realeased SRS from chnvideo mirror](http://demo.chnvideo.com:8085/srs/releases/) |
| 6 | + | ||
| 7 | +[获得源码(github): Checkout SRS source from github](https://github.com/winlinvip/simple-rtmp-server) | ||
| 8 | + | ||
| 9 | +```bash | ||
| 10 | +git clone https://github.com/winlinvip/simple-rtmp-server.git | ||
| 11 | +``` | ||
| 12 | + | ||
| 13 | +[获得源码(国内CSDN镜像): Checkout SRS source from CSDN](https://code.csdn.net/winlinvip/srs-csdn/events) | ||
| 14 | + | ||
| 15 | +```bash | ||
| 16 | +git clone https://code.csdn.net/winlinvip/srs-csdn.git | ||
| 17 | +``` | ||
| 6 | 18 | ||
| 7 | ## About | 19 | ## About |
| 8 | 20 |
| @@ -42,13 +42,6 @@ git checkout master && git merge srs.master | @@ -42,13 +42,6 @@ git checkout master && git merge srs.master | ||
| 42 | ret=$?; if [[ 0 -ne $ret ]]; then failed_msg "合并github分支失败, ret=$ret"; exit $ret; fi | 42 | ret=$?; if [[ 0 -ne $ret ]]; then failed_msg "合并github分支失败, ret=$ret"; exit $ret; fi |
| 43 | ok_msg "合并github分支成功" | 43 | ok_msg "合并github分支成功" |
| 44 | 44 | ||
| 45 | -git commit -a -m "merge from github.srs" | ||
| 46 | -ret=$?; if [[ 0 -ne $ret ]]; then | ||
| 47 | - warn_msg "提交CSDN失败,忽略, ret=$ret"; | ||
| 48 | -else | ||
| 49 | - ok_msg "提交CSDN成功" | ||
| 50 | -fi | ||
| 51 | - | ||
| 52 | for ((;;)); do | 45 | for ((;;)); do |
| 53 | git push | 46 | git push |
| 54 | ret=$?; if [[ 0 -ne $ret ]]; then | 47 | ret=$?; if [[ 0 -ne $ret ]]; then |
-
请 注册 或 登录 后发表评论