From f226aed145335eaac2f1e0f8a75ab0fcec33605c Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sat, 4 Apr 2020 23:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=9D=A2=E6=94=AF=E6=8C=81265(?=
 =?UTF-8?q?=E5=8C=85=E6=8B=ACrtmp)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md           | 11 ++++++-----
 README_en.md        | 11 ++++++-----
 src/Common/config.h |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index df753213..eb019d28 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@
   - 支持http[s]-flv直播
   - 支持websocket-flv直播
   - 支持任意编码格式的rtmp推流，只是除H264/H265+AAC外无法转协议
+  - 支持[RTMP-H265](https://github.com/ksvc/FFmpeg/wiki)
 
 - HLS
   - 支持HLS文件生成，自带HTTP文件服务器
@@ -85,14 +86,14 @@
 
     |          功能/编码格式           | H264 | H265 | AAC  | other |
     | :------------------------------: | :--: | :--: | :--: | :---: |
-    | RTSP[S] --> RTMP/HTTP[S]-FLV/FLV |  Y   |  N   |  Y   |   N   |
-    |         RTMP --> RTSP[S]         |  Y   |  N   |  Y   |   N   |
+    | RTSP[S] --> RTMP/HTTP[S]-FLV/FLV |  Y   |  Y   |  Y   |   N   |
+    |         RTMP --> RTSP[S]         |  Y   |  Y   |  Y   |   N   |
     |         RTSP[S] --> HLS          |  Y   |  Y   |  Y   |   N   |
-    |           RTMP --> HLS           |  Y   |  N   |  Y   |   N   |
+    |           RTMP --> HLS           |  Y   |  Y   |  Y   |   N   |
     |         RTSP[S] --> MP4          |  Y   |  Y   |  Y   |   N   |
-    |           RTMP --> MP4           |  Y   |  N   |  Y   |   N   |
+    |           RTMP --> MP4           |  Y   |  Y   |  Y   |   N   |
     |         MP4 --> RTSP[S]          |  Y   |  Y   |  Y   |   N   |
-    |           MP4 --> RTMP           |  Y   |  N   |  Y   |   N   |
+    |           MP4 --> RTMP           |  Y   |  Y   |  Y   |   N   |
 
 - 流生成：
 
diff --git a/README_en.md b/README_en.md
index ce6f4c80..9d1e5bd1 100644
--- a/README_en.md
+++ b/README_en.md
@@ -31,6 +31,7 @@
   - H264/AAC codec.
   - Recorded as flv or mp4.
   - Vod of mp4.
+  - support [RTMP-H265](https://github.com/ksvc/FFmpeg/wiki)
   
 - HLS
   - RTSP RTMP can be converted into HLS,built-in HTTP server.
@@ -58,14 +59,14 @@
 
 |          protocol/codec          | H264 | H265 | AAC  | other |
 | :------------------------------: | :--: | :--: | :--: | :---: |
-| RTSP[S] --> RTMP/HTTP[S]-FLV/FLV |  Y   |  N   |  Y   |   N   |
-|         RTMP --> RTSP[S]         |  Y   |  N   |  Y   |   N   |
+| RTSP[S] --> RTMP/HTTP[S]-FLV/FLV |  Y   |  Y   |  Y   |   N   |
+|         RTMP --> RTSP[S]         |  Y   |  Y   |  Y   |   N   |
 |         RTSP[S] --> HLS          |  Y   |  Y   |  Y   |   N   |
-|           RTMP --> HLS           |  Y   |  N   |  Y   |   N   |
+|           RTMP --> HLS           |  Y   |  Y   |  Y   |   N   |
 |         RTSP[S] --> MP4          |  Y   |  Y   |  Y   |   N   |
-|           RTMP --> MP4           |  Y   |  N   |  Y   |   N   |
+|           RTMP --> MP4           |  Y   |  Y   |  Y   |   N   |
 |         MP4 --> RTSP[S]          |  Y   |  Y   |  Y   |   N   |
-|           MP4 --> RTMP           |  Y   |  N   |  Y   |   N   |
+|           MP4 --> RTMP           |  Y   |  Y   |  Y   |   N   |
 
 - Stream generation：
 
diff --git a/src/Common/config.h b/src/Common/config.h
index c2aad3c9..77bd6b1c 100644
--- a/src/Common/config.h
+++ b/src/Common/config.h
@@ -41,7 +41,7 @@ bool loadIniConfig(const char *ini_path = nullptr);
 #define CLEAR_ARR(arr) for(auto &item : arr){ item = 0;}
 #endif //CLEAR_ARR
 
-#define SERVER_NAME "ZLMediaKit-4.0(build in " __DATE__ " " __TIME__ ")"
+#define SERVER_NAME "ZLMediaKit-5.0(build in " __DATE__ " " __TIME__ ")"
 #define VHOST_KEY "vhost"
 #define HTTP_SCHEMA "http"
 #define RTSP_SCHEMA "rtsp"