aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
diff options
context:
space:
mode:
authorAbdulmohsen <ArabCoders@users.noreply.github.com>2023-11-24 00:00:53 +0300
committerGitHub <noreply@github.com>2023-11-24 00:00:53 +0300
commit9d5dc4d71b6f542d4adb60a6287a86f558c1dcc2 (patch)
treeb646b8209bd90df22c4a2a2df612f09b3be2c170 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
parent324c86e14d9d76670b4e3439c2ed5fcbbfb9f8ff (diff)
parent3d4d33bcbac07be40c132cf3a3c39630ace7b444 (diff)
Merge branch 'jellyfin:master' into master
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 6621ae284..46fd1ae47 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -20,6 +20,7 @@ using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.MediaInfo;
using Microsoft.Extensions.Configuration;
+using IConfigurationManager = MediaBrowser.Common.Configuration.IConfigurationManager;
namespace MediaBrowser.Controller.MediaEncoding
{