diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-11-04 20:17:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 20:17:41 +0000 |
| commit | ec245dce9074bd4fa64f1252f62d355e9185696c (patch) | |
| tree | 97f9fe31f10d42e167f6502bc1227a3006fec912 /Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs | |
| parent | f06e4826c764c1214478a741b0f93315a8bba76b (diff) | |
| parent | ad262fe8a65137b1678508435054be50b053f217 (diff) | |
Merge branch 'master' into NetworkPR2
Diffstat (limited to 'Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs')
| -rw-r--r-- | Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs b/Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs index 6b516977e..366301d3e 100644 --- a/Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs +++ b/Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs @@ -123,9 +123,8 @@ namespace Jellyfin.Api.Helpers state.Dispose(); } - await new ProgressiveFileCopier(outputPath, job, transcodingJobHelper, CancellationToken.None) - .WriteToAsync(httpContext.Response.Body, CancellationToken.None).ConfigureAwait(false); - return new FileStreamResult(httpContext.Response.Body, contentType); + var stream = new ProgressiveFileStream(outputPath, job, transcodingJobHelper); + return new FileStreamResult(stream, contentType); } finally { |