From c6a01e037088079d17d2940437eea78c2e90ede0 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 21 Dec 2015 11:10:06 -0500 Subject: [PATCH] allow separate customization of ffmpeg/ffprobe paths --- .../FFMpeg/FFMpegDownloader.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs index 00df7593b0..7a83ddc7e7 100644 --- a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs +++ b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs @@ -111,6 +111,16 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg DeleteOlderFolders(Path.GetDirectoryName(versionedDirectoryPath), excludeFromDeletions); + // Allow just one of these to be overridden, if desired. + if (!string.IsNullOrWhiteSpace(customffMpegPath)) + { + info.EncoderPath = customffMpegPath; + } + if (!string.IsNullOrWhiteSpace(customffProbePath)) + { + info.EncoderPath = customffProbePath; + } + return info; }