diff options
| author | Vasily <JustAMan@users.noreply.github.com> | 2019-03-13 01:42:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 01:42:07 +0300 |
| commit | 605bf0e8c3836d561ecd5626f25f995eb933b1bb (patch) | |
| tree | 107c8aa0f7d3f202ea840ab660797ad48685d641 /Emby.Server.Implementations | |
| parent | 89e2af6b57e07be7e62063e7780730dab68a5693 (diff) | |
| parent | b864e9da2a512250eff48baae28251db5a508f8f (diff) | |
Merge pull request #1100 from ploughpuff/rmprobeswitch
Finalise removal of --ffprobe switch
Diffstat (limited to 'Emby.Server.Implementations')
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 1 | ||||
| -rw-r--r-- | Emby.Server.Implementations/IStartupOptions.cs | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index 98f6ab6bc..1810064e6 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -837,7 +837,6 @@ namespace Emby.Server.Implementations LoggerFactory, JsonSerializer, StartupOptions.FFmpegPath, - StartupOptions.FFprobePath, ServerConfigurationManager, FileSystemManager, () => SubtitleEncoder, diff --git a/Emby.Server.Implementations/IStartupOptions.cs b/Emby.Server.Implementations/IStartupOptions.cs index 24aaa76c0..6e915de3d 100644 --- a/Emby.Server.Implementations/IStartupOptions.cs +++ b/Emby.Server.Implementations/IStartupOptions.cs @@ -8,11 +8,6 @@ namespace Emby.Server.Implementations string FFmpegPath { get; } /// <summary> - /// --ffprobe - /// </summary> - string FFprobePath { get; } - - /// <summary> /// --service /// </summary> bool IsService { get; } |