Merge branch 'master' into comparisons

2025-12-17 14:33:06 +03:00 · 2021-06-19 15:04:30 +01:00
parent 97c2c523a8 0c3dcdf77b
commit 6648b7d7da
486 changed files with 5584 additions and 4155 deletions
--- a/Jellyfin.Api/Controllers/VideoHlsController.cs
+++ b/Jellyfin.Api/Controllers/VideoHlsController.cs
@@ -265,6 +265,7 @@ namespace Jellyfin.Api.Controllers
                EnableSubtitlesInManifest = enableSubtitlesInManifest ?? true
            };

+            // CTS lifecycle is managed internally.
            var cancellationTokenSource = new CancellationTokenSource();
            using var state = await StreamingHelpers.GetStreamingState(
                    streamingRequest,