aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
diff options
context:
space:
mode:
authorcrobibero <cody@robibe.ro>2020-11-20 08:25:45 -0700
committercrobibero <cody@robibe.ro>2020-11-20 08:25:45 -0700
commit7e7d027bb0f80daf32d255bb5405457ed9e1550b (patch)
tree6b8bdd9c9eed691014187a01eaeafc152e940f84 /Jellyfin.Api/Helpers/TranscodingJobHelper.cs
parentbf66f57069e14de2954d4a1c799bb16232129821 (diff)
parentde2f4967d1973d58e46a41104cef01773e1692c8 (diff)
Merge remote-tracking branch 'upstream/master' into transcode-file-task-schedule
Diffstat (limited to 'Jellyfin.Api/Helpers/TranscodingJobHelper.cs')
-rw-r--r--Jellyfin.Api/Helpers/TranscodingJobHelper.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
index 26a03105d..85cfbd00f 100644
--- a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
+++ b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
@@ -771,8 +771,9 @@ namespace Jellyfin.Api.Helpers
new LiveStreamRequest { OpenToken = state.MediaSource.OpenToken },
cancellationTokenSource.Token)
.ConfigureAwait(false);
+ var encodingOptions = _serverConfigurationManager.GetEncodingOptions();
- _encodingHelper.AttachMediaSourceInfo(state, liveStreamResponse.MediaSource, state.RequestedUrl);
+ _encodingHelper.AttachMediaSourceInfo(state, encodingOptions, liveStreamResponse.MediaSource, state.RequestedUrl);
if (state.VideoRequest != null)
{