aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs
diff options
context:
space:
mode:
authorPloughPuff <ploughpuff@protonmail.com>2019-01-28 20:58:47 +0000
committerBond-009 <bond.009@outlook.com>2019-01-31 18:56:34 +0100
commite18b89ca275feceee21b540878017a2373e7de6c (patch)
treed81c2b3c19a418d609c0ba66c71b85eb3f83106e /Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs
parentebd2a3008791ac4043a775d48f0971a554bd9ff4 (diff)
Move Options to Jellyfin.Server and create interface file
Changes following review comments.
Diffstat (limited to 'Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs')
-rw-r--r--Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs b/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs
index 4c926b91a..b422b8862 100644
--- a/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs
+++ b/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs
@@ -6,6 +6,7 @@ using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging;
+using Emby.Server.Implementations.ParsedStartupOptions;
namespace Emby.Server.Implementations.FFMpeg
{
@@ -28,10 +29,10 @@ namespace Emby.Server.Implementations.FFMpeg
_ffmpegInstallInfo = ffmpegInstallInfo;
}
- public FFMpegInfo GetFFMpegInfo(StartupOptions options)
+ public FFMpegInfo GetFFMpegInfo(IStartupOptions options)
{
- var customffMpegPath = options.FFmpeg;
- var customffProbePath = options.FFprobe;
+ var customffMpegPath = options.FFmpegPath;
+ var customffProbePath = options.FFprobePath;
if (!string.IsNullOrWhiteSpace(customffMpegPath) && !string.IsNullOrWhiteSpace(customffProbePath))
{