Skip to content

Commit 01a825c

Browse files
winshiningwinshining
committed
[dev] updated AUTHORS, LICENSE and README.
1 parent dfb02f4 commit 01a825c

File tree

5 files changed

+43
-33
lines changed

5 files changed

+43
-33
lines changed

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
When you meet a bug, please open the issue including a title prefixed by '[bug]' and describe it as follows:
2-
当你碰到一个 bug，请在提出问题时以 '[bug]' 为前缀写明标题，并且像下面的内容一样描述它:
2+
(当你碰到一个 bug，请在提出问题时以 '[bug]' 为前缀写明标题，并且像下面的内容一样描述它):
33

4-
### Expected behavior / 期望行为
4+
### Expected behavior (期望行为)
55

6-
### Actual behavior / 实际行为
6+
### Actual behavior (实际行为)
77

8-
### OS and Nginx version / 操作系统和 Nginx 版本号
8+
### OS and Nginx version (操作系统和 Nginx 版本号)
99

10-
### Configuration file / 配置文件
10+
### Configuration file (配置文件)
1111

12-
### Steps to reproduce the behavior / 复现问题步骤
12+
### Steps to reproduce the behavior (复现问题步骤)
13+
14+
### Error log if any (错误日志)

‎AUTHORS‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,8 @@ Project author:
5151
-
5252
Contacts:
5353
https://github.com/ham3r
54+
55+
deamos
56+
Scranton, PA
57+
Contacts:
58+
https://github.com/deamos

‎LICENSE‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
BSD 2-Clause License
22

33
Copyright (c) 2012-2017, Roman Arutyunyan
4-
Copyright (c) 2017-2021, Winshining
5-
Copyright (c) 2018-2019, plainheart, HeyJupiter
4+
Copyright (c) 2017-2023, Winshining
65
Copyright (c) 2018, han4235, Vladimir Vainer
6+
Copyright (c) 2018-2019, plainheart, HeyJupiter
77
Copyright (c) 2019, ever4Keny
88
Copyright (c) 2020, spacewander, ham3r
9+
Copyright (c) 2022, deamons
910
All rights reserved.
1011

1112
Redistribution and use in source and binary forms, with or without

‎README.CN.md‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
[![Build Status](https://app.travis-ci.com/winshining/nginx-http-flv-module.svg?branch=master)](https://app.travis-ci.com/winshining/nginx-http-flv-module)
44

5-
基于 [nginx-rtmp-module](https://github.com/arut/nginx-rtmp-module) 的流媒体服务器。
5+
一款基于 [nginx-rtmp-module](https://github.com/arut/nginx-rtmp-module) 的流媒体服务器。
66

77
[English README](https://github.com/winshining/nginx-http-flv-module/blob/master/README.md)。
88

99
如果您喜欢这个模块，可以通过赞赏来支持我的工作，非常感谢！
1010

11-
![reward_qrcode_winshining](https://raw.githubusercontent.com/wiki/winshining/nginx-http-flv-module/reward_qrcode_winshining.png)
11+
![reward_qrcode_winshining](https://gitee.com/winshining/nginx-http-flv-module/raw/master/qrcode/reward_qrcode_winshining.png)
1212

1313
### 感谢
1414

@@ -24,17 +24,18 @@
2424

2525
* nginx-http-flv-module 的其他功能与 [nginx-rtmp-module](https://github.com/arut/nginx-rtmp-module) 的对比：
2626

27-
| 功能 | nginx-http-flv-module | nginx-rtmp-module | 备注 |
28-
| :---------------: | :-------------------: | :---------------: | :-------------------------------------: |
29-
| HTTP-FLV (播放) | √ | x | 支持 HTTPS-FLV 和 chunked 回复 |
30-
| GOP 缓存 | √ | x | |
31-
| 虚拟主机 | √ | x | |
32-
| 省略 `listen` 配置| √ | 见备注 | 配置中必须有一个 `listen` |
33-
| 纯音频支持 | √ | 见备注 |`wait_video` 或 `wait_key` 开启后无法工作|
34-
| `reuseport` 支持 | √ | x | |
35-
| 定时打印访问记录 | √ | x | |
36-
| JSON 风格的 stat | √ | x | |
37-
|stat 中包含录制详情| √ | x | |
27+
| 功能 | nginx-http-flv-module | nginx-rtmp-module | 备注 |
28+
| :----------------------: | :-------------------: | :---------------: | :-------------------------------------: |
29+
| HTTP-FLV (播放) | √ | x | 支持 HTTPS-FLV 和 chunked 回复 |
30+
| GOP 缓存 | √ | x | |
31+
| 虚拟主机 | √ | x | |
32+
| 省略 `listen` 配置项 | √ | 见备注 | 配置中必须有一个 `listen` |
33+
| RTMP/HTTP-FLV 纯音频支持 | √ | 见备注 |`wait_video` 或 `wait_key` 开启后无法工作|
34+
| HLS 单轨支持 | √ | x | |
35+
| `reuseport` 支持 | √ | x | |
36+
| 定时打印访问记录 | √ | x | |
37+
| JSON 风格的数据信息 | √ | x | |
38+
| 录制的数据信息 | √ | x | |
3839

3940
## 兼容性
4041

‎README.md‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Build Status](https://app.travis-ci.com/winshining/nginx-http-flv-module.svg?branch=master)](https://app.travis-ci.com/winshining/nginx-http-flv-module)
44

5-
Media streaming server based on [nginx-rtmp-module](https://github.com/arut/nginx-rtmp-module).
5+
A media streaming server based on [nginx-rtmp-module](https://github.com/arut/nginx-rtmp-module).
66

77
[中文说明](https://github.com/winshining/nginx-http-flv-module/blob/master/README.CN.md).
88

@@ -24,17 +24,18 @@ Donate if you like this module. Many thanks to you!
2424

2525
* Other features provided by nginx-http-flv-module vs [nginx-rtmp-module](https://github.com/arut/nginx-rtmp-module):
2626

27-
| Features | nginx-http-flv-module | nginx-rtmp-module | Remarks |
28-
| :---------------------: | :-------------------: | :---------------: | :---------------------------------------------: |
29-
| HTTP-FLV (for play) | √ | x | HTTPS-FLV and chunked response supported |
30-
| GOP cache | √ | x | |
31-
| VHOST | √ | x | |
32-
| Omit `listen` directive | √ | See remarks | There MUST be at least one `listen` directive |
33-
| Audio-only support | √ | See remarks | Won't work if `wait_video` or `wait_key` is on |
34-
| `reuseport` support | √ | x | |
35-
| Timer for access log | √ | x | |
36-
| JSON style stat | √ | x | |
37-
| Stat for recordings | √ | x | |
27+
| Features | nginx-http-flv-module | nginx-rtmp-module | Remarks |
28+
| :--------------------------------: | :-------------------: | :---------------: | :-------------------------------------------: |
29+
| HTTP-FLV (for play) | √ | x | HTTPS-FLV and chunked response supported |
30+
| GOP cache | √ | x | |
31+
| Virtual Host | √ | x | |
32+
| Omit `listen` directive | √ | See remarks | There MUST be at least one `listen` directive |
33+
|Audio-only support for RTMP/HTTP-FLV| √ | See remarks |Won't work if `wait_video` or `wait_key` is on |
34+
| Single-track support for HLS | √ | x | |
35+
| `reuseport` support | √ | x | |
36+
| Timer for access log | √ | x | |
37+
| JSON style statistics | √ | x | |
38+
| Statistics for recordings | √ | x | |
3839

3940
## Compatibility
4041

0 commit comments

Comments
 (0)