diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2020-11-06 15:27:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 15:27:51 +0100 |
| commit | 83d7e0a2657f4fb955366d71ab93d17f5a769cd4 (patch) | |
| tree | af2fc3617635f6674050dfca47cb31eb4332dbdc /Jellyfin.Api/Controllers/LiveTvController.cs | |
| parent | f172b37401585bbcc72708bd1b34f4875ced1a76 (diff) | |
| parent | 41b38c6735e4dc2ccb9b5c277950bf6c079d983b (diff) | |
Merge pull request #4392 from crobibero/livetv-ts-fix
Fix LiveTV TS playback
Diffstat (limited to 'Jellyfin.Api/Controllers/LiveTvController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/LiveTvController.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Jellyfin.Api/Controllers/LiveTvController.cs b/Jellyfin.Api/Controllers/LiveTvController.cs index f89c31e8b..88a7542ce 100644 --- a/Jellyfin.Api/Controllers/LiveTvController.cs +++ b/Jellyfin.Api/Controllers/LiveTvController.cs @@ -1220,11 +1220,8 @@ namespace Jellyfin.Api.Controllers return NotFound(); } - await using var memoryStream = new MemoryStream(); - await new ProgressiveFileCopier(liveStreamInfo, null, _transcodingJobHelper, CancellationToken.None) - .WriteToAsync(memoryStream, CancellationToken.None) - .ConfigureAwait(false); - return File(memoryStream, MimeTypes.GetMimeType("file." + container)); + var liveStream = new ProgressiveFileStream(liveStreamInfo.GetFilePath(), null, _transcodingJobHelper); + return new FileStreamResult(liveStream, MimeTypes.GetMimeType("file." + container)); } private void AssertUserCanManageLiveTv() |