diff options
| author | Anthony Lavado <anthonylavado@me.com> | 2020-08-19 08:17:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 08:17:03 -0400 |
| commit | 634ee2d1e913277ea8f419aca9d91a8e58426642 (patch) | |
| tree | d521b315893a1daf09da62c55292b3eab00e270e /Jellyfin.Api/Controllers/VideosController.cs | |
| parent | 93fe595e5e9863874c1973e4f2d7f3c85549d3f9 (diff) | |
| parent | 3a722740ceb83d796a7111ae40b2b67d6a313465 (diff) | |
Merge pull request #3861 from crobibero/fixes
API Fixes
Diffstat (limited to 'Jellyfin.Api/Controllers/VideosController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/VideosController.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Jellyfin.Api/Controllers/VideosController.cs b/Jellyfin.Api/Controllers/VideosController.cs index ae32dbf03..14d3f2460 100644 --- a/Jellyfin.Api/Controllers/VideosController.cs +++ b/Jellyfin.Api/Controllers/VideosController.cs @@ -471,7 +471,7 @@ namespace Jellyfin.Api.Controllers StreamingHelpers.AddDlnaHeaders(state, Response.Headers, true, startTimeTicks, Request, _dlnaManager); var httpClient = _httpClientFactory.CreateClient(); - return await FileStreamResponseHelpers.GetStaticRemoteStreamResult(state, isHeadRequest, this, httpClient).ConfigureAwait(false); + return await FileStreamResponseHelpers.GetStaticRemoteStreamResult(state, isHeadRequest, httpClient, HttpContext).ConfigureAwait(false); } if (@static.HasValue && @static.Value && state.InputProtocol != MediaProtocol.File) @@ -507,7 +507,7 @@ namespace Jellyfin.Api.Controllers state.MediaPath, contentType, isHeadRequest, - this); + HttpContext); } // Need to start ffmpeg (because media can't be returned directly) @@ -517,10 +517,9 @@ namespace Jellyfin.Api.Controllers return await FileStreamResponseHelpers.GetTranscodedFile( state, isHeadRequest, - this, + HttpContext, _transcodingJobHelper, ffmpegCommandLineArguments, - Request, _transcodingJobType, cancellationTokenSource).ConfigureAwait(false); } |
