合并 #2183

3rdpart/media-server

@@ -1 +1 @@
-Subproject commit 357ef885afa5112c8cb873eab21d94d26744c0ab
+Subproject commit 51e08ea0cc366ed772e5690f874cebbbeebe591e

AUTHORS

@@ -65,3 +65,4 @@ WuPeng <wp@zafu.edu.cn>
 [PioLing](https://github.com/PioLing)
 [KevinZang](https://github.com/ZSC714725)
 [gongluck](https://github.com/gongluck)
+[a-ucontrol](https://github.com/a-ucontrol)

README.md

@@ -80,7 +80,7 @@
 - fMP4
   - 支持http[s]-fmp4直播
   - 支持ws[s]-fmp4直播
-  - 支持H264/H265/AAC/G711/OPUS编码
+  - 支持H264/H265/AAC/G711/OPUS/MJPEG编码
 
 - HTTP[S]与WebSocket
   - 服务器支持`目录索引生成`,`文件下载`,`表单提交请求`
@@ -290,6 +290,7 @@ bash build_docker_images.sh
 [PioLing](https://github.com/PioLing)
 [KevinZang](https://github.com/ZSC714725)
 [gongluck](https://github.com/gongluck)
+[a-ucontrol](https://github.com/a-ucontrol)
 
 ## 使用案例
 

src/Rtsp/RtspSession.h

@@ -74,6 +74,8 @@ protected:
 
     //回复客户端
     virtual bool sendRtspResponse(const std::string &res_code, const StrCaseMap &header = StrCaseMap(), const std::string &sdp = "", const char *protocol = "RTSP/1.0");
+
+protected:
     //url解析后保存的相关信息
     MediaInfo _media_info;