From ab00d30e72fea3b9cb33dc065861e92e5d0eeb14 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 21 十月 2023 14:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lib/mediamtx/LICENSE |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/lib/mediamtx/LICENSE b/lib/mediamtx/LICENSE
index 50bbbd8..bfbf85a 100644
--- a/lib/mediamtx/LICENSE
+++ b/lib/mediamtx/LICENSE
@@ -19,3 +19,8 @@
 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.
+
+internal/core/hls.min.js is Copyright (c) Dailymotion and is protected by
+its own license (Apache License, Version 2.0) available at
+
+https://github.com/video-dev/hls.js/blob/master/LICENSE

--
Gitblit v1.9.3