2 files changed, 12 insertions, 2 deletions
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;
         }
 
diff --git a/MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs b/MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs
index 5c3ada82b4..5854a5804c 100644
--- a/MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs
+++ b/MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs
@@ -90,12 +90,12 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
                 "libx265",
                 "mpeg4",
                 "msmpeg4",
-                "libvpx",
+                //"libvpx",
                 //"libvpx-vp9",
                 "aac",
                 "ac3",
                 "libmp3lame",
-                "libvorbis",
+                //"libvorbis",
                 "srt"
             };