diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-11-19 09:04:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 09:04:49 +0000 |
| commit | ef05485243b1d0043b442a4f5ab4cc9be99f16bb (patch) | |
| tree | 39fbf843ae9ebb0c15902d18c3617aece339df50 /Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs | |
| parent | 3ffdcfdb802079ee9ad3e76527b4519f3fe4458a (diff) | |
| parent | 49ebbcf87edb805862c032e48796d2b8020e5aa7 (diff) | |
Merge branch 'master' into PluginConfigSave
Diffstat (limited to 'Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs')
| -rw-r--r-- | Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs b/Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs index b5e42ea29..872a46824 100644 --- a/Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs +++ b/Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs @@ -101,7 +101,7 @@ namespace Jellyfin.Api.Models.PlaybackDtos return _config.GetConfiguration<EncodingOptions>("encoding"); } - private async void TimerCallback(object state) + private async void TimerCallback(object? state) { if (_job.HasExited) { |