Merge branch 'master' of https://gitcode.net/qq_26700087/simpleVideoServer

LICENSE

+MIT License
+
+Copyright (c) 2022 云逸之
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

readme.md

@@ -6,7 +6,7 @@ camServer 的demo使用esp32cam自己提供http服务和视频流，会有较大
 
 ```mermaid
 graph LR
-e(esp32)
+e(esp32cam)
 S(SimpleVideoServer)
 e -->|帧|S
 B(浏览器)
@@ -27,7 +27,7 @@ S -->|mjpeg视频流|B
 
 * 下载[linux服务端发行版](https://gitcode.net/qq_26700087/simpleVideoServer/uploads/3e09fac66816c19f221f61b4296c0670/SimpleVideoSever_linux.7z)
 
-  需要安装 pzip或者7zip。否则会提示7z找不到。也可以自行解压后上传。注意jre的bin目录的执行权限
+  需要安装 p7zip或者7zip。否则会提示7z找不到。也可以自行解压后上传。注意jre的bin目录的执行权限
 
   运行
 
@@ -103,4 +103,4 @@ stream.port=8004
 
   
   
-  
\ No newline at end of file
+