diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-12-21 12:50:25 -0500 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-12-21 12:50:25 -0500 |
| commit | 887c09e7375dc07c7cf76335f6d291efce982415 (patch) | |
| tree | 42c7e21ca29471d9b7f8b2c9f8b0fb94c08f9105 /MediaBrowser.Server.Startup.Common | |
| parent | 7dffc197da7fd95eaec750f7a398c18fa2291dc7 (diff) | |
| parent | 83a2823c17b17d47338e1705e85acf18a5e4af5d (diff) | |
Merge pull request #1346 from MediaBrowser/master
merge from master
Diffstat (limited to 'MediaBrowser.Server.Startup.Common')
| -rw-r--r-- | MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs | 4 |
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 00df7593b..7a83ddc7e 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 5c3ada82b..5854a5804 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" }; |