diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 620d3dc8a..000000000 --- a/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -# Compiled Object files -*.slo -*.lo -*.o - -# Compiled Dynamic libraries -*.so -*.dylib - -# Compiled Static libraries -*.lai -*.la -*.a diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f37c3072c..000000000 --- a/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2013 winlin - -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. diff --git a/README.md b/README.md index a6a2dc723..dfeaa32ec 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,10 @@ -simple-rtmp-server -================== +# SRS(Simple Realtime Server) + +SRS GB28181功能已经合并到了SRS 5.0,请参考[SRS #3176](https://github.com/ossrs/srs/issues/3176),使用`5.0.74+`版本。 + +SRS Windows功能已经合并到了SRS 5.0,请参考[SRS #2532](https://github.com/ossrs/srs/issues/2532),使用`5.0.89+`版本。 + +SRS HEVC功能已经合并到了SRS 6.0,请参考[SRS #465](https://github.com/ossrs/srs/issues/465),使用`6.0.4+`版本。 + +Winlin, 2022.11 -simple rtmp origin/edge live server over state-threads.