starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 05:53:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Finalise removal of --ffprobe switch

Browse Source 
Removed --ffprobe from src files and server/docker scripts.
This commit is contained in:
PloughPuff
2019-03-12 22:09:18 +00:00
parent f10382a696
commit b864e9da2a
11 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@@ -51,7 +51,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
private readonly IProcessFactory _processFactory;
private readonly int DefaultImageExtractionTimeoutMs;
private readonly string StartupOptionFFmpegPath;
private readonly string StartupOptionFFprobePath;
private readonly SemaphoreSlim _thumbnailResourcePool = new SemaphoreSlim(1, 1);
private readonly List<ProcessWrapper> _runningProcesses = new List<ProcessWrapper>();
@@ -60,7 +59,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
ILoggerFactory loggerFactory,
IJsonSerializer jsonSerializer,
string startupOptionsFFmpegPath,
string startupOptionsFFprobePath,
IServerConfigurationManager configurationManager,
IFileSystem fileSystem,
Func<ISubtitleEncoder> subtitleEncoder,
@@ -71,7 +69,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
_logger = loggerFactory.CreateLogger(nameof(MediaEncoder));
_jsonSerializer = jsonSerializer;
StartupOptionFFmpegPath = startupOptionsFFmpegPath;
StartupOptionFFprobePath = startupOptionsFFprobePath;
ConfigurationManager = configurationManager;
FileSystem = fileSystem;
SubtitleEncoder = subtitleEncoder;
@@ -86,12 +83,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
/// </summary>
public void SetFFmpegPath()
{
// ToDo - Finalise removal of the --ffprobe switch
if (!string.IsNullOrEmpty(StartupOptionFFprobePath))
{
_logger.LogWarning("--ffprobe switch is deprecated and shall be removed in the next release");
}
// 1) Custom path stored in config/encoding xml file under tag <EncoderAppPath> takes precedence
if (!ValidatePath(ConfigurationManager.GetConfiguration<EncodingOptions>("encoding").EncoderAppPath, FFmpegLocation.Custom))
{