diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-06-20 02:50:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-20 02:50:05 -0400 |
| commit | 365f6f957ddea650acf99eb09b0356939cf15a7c (patch) | |
| tree | f6ed019d7eb3e3bb84b6b7b4816b662b071bff58 /MediaBrowser.Model | |
| parent | d6b5adba5afc2f45bb8ee47c661274a2af337039 (diff) | |
| parent | 39ed3696ad783765b083b4a99fa4d7d91f0fa32c (diff) | |
Merge pull request #1862 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Configuration/EncodingOptions.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/SystemInfo.cs | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs index d33cf5577..91d28a296 100644 --- a/MediaBrowser.Model/Configuration/EncodingOptions.cs +++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs @@ -9,6 +9,7 @@ namespace MediaBrowser.Model.Configuration public bool EnableThrottling { get; set; } public int ThrottleDelaySeconds { get; set; } public string HardwareAccelerationType { get; set; } + public string EncoderAppPath { get; set; } public EncodingOptions() { diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs index 6b54a90d4..73d5961f6 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -152,6 +152,8 @@ namespace MediaBrowser.Model.System /// <value><c>true</c> if [supports automatic run at startup]; otherwise, <c>false</c>.</value> public bool SupportsAutoRunAtStartup { get; set; } + public bool HasExternalEncoder { get; set; } + /// <summary> /// Initializes a new instance of the <see cref="SystemInfo" /> class. /// </summary> |