alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-30 19:32:57 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into FixFor5280Part2

Browse Source
This commit is contained in:
BaronGreenback
2021-02-28 10:12:14 +00:00
parent 1d6f489f17 f8c9c37c29
commit 80ca3da55c
177 changed files with 2955 additions and 2974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Jellyfin.Server/CoreAppHost.cs
View File

@@ -11,7 +11,6 @@ using Jellyfin.Server.Implementations;
using Jellyfin.Server.Implementations.Activity;
using Jellyfin.Server.Implementations.Events;
using Jellyfin.Server.Implementations.Users;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller;
using MediaBrowser.Controller.BaseItemManager;
using MediaBrowser.Controller.Drawing;

2
Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs
View File

@@ -32,7 +32,7 @@ namespace Jellyfin.Server.Migrations.Routines
public void Perform()
{
// Set EnableThrottling to false since it wasn't used before and may introduce issues
var encoding = _configManager.GetConfiguration<EncodingOptions>("encoding");
var encoding = _configManager.GetEncodingOptions();
if (encoding.EnableThrottling)
{
_logger.LogInformation("Disabling transcoding throttling during migration");