diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-08-19 02:23:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-19 02:23:00 -0400 |
| commit | 3e8303bd4b282861c5ef44b9187090574c7a65f7 (patch) | |
| tree | 34fc1552d02eccd421684b9a6d367c99704d42b4 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | a1a5446342ca653f57ba21a9ac291f42897c4caf (diff) | |
| parent | 8f59f39873be3ee54aac1403d561031c459f4845 (diff) | |
Merge pull request #2077 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index e90f6bdc3..f488be11a 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -123,10 +123,22 @@ namespace MediaBrowser.MediaEncoding.Encoder return "System"; } + if (IsDefaultPath(FFMpegPath)) + { + return "Default"; + } + return "Custom"; } } + private bool IsDefaultPath(string path) + { + var parentPath = Path.Combine(ConfigurationManager.ApplicationPaths.ProgramDataPath, "ffmpeg", "20160410"); + + return FileSystem.ContainsSubPath(parentPath, path); + } + private bool IsSystemInstalledPath(string path) { if (path.IndexOf("/", StringComparison.Ordinal) == -1 && path.IndexOf("\\", StringComparison.Ordinal) == -1) |