diff options
| author | crobibero <cody@robibe.ro> | 2020-11-06 14:46:21 -0700 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-11-06 14:46:21 -0700 |
| commit | 9056908bc776a4a8b3f02c294311a24a7c38a331 (patch) | |
| tree | a0b3956f02a56c27691ee9f8e9340f47d7d186ad /Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs | |
| parent | d42bb515ce3692abd9295008872c7f9d62b47652 (diff) | |
| parent | 4a5651e5b2fb8e483cabae4443f327f1cdf70b92 (diff) | |
Merge remote-tracking branch 'upstream/master' into video-resolver
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 { |