diff options
| author | crobibero <cody@robibe.ro> | 2020-11-03 07:05:58 -0700 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-11-03 07:05:58 -0700 |
| commit | 5d88e610768c8b680096938a372585638ef18fe3 (patch) | |
| tree | 28cf4327a0cb19d6025f8fd426351becbb80b085 /Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs | |
| parent | 0c674b496f3f4503b6d45c763aadc9b1c5d2735d (diff) | |
| parent | 8fc16043c7c080afd31f67798b74ccdf62eb583c (diff) | |
Merge remote-tracking branch 'upstream/master' into livetv-ts-fix
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 { |