diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-02-19 21:07:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-19 21:07:09 +0100 |
| commit | 0f173e1778577f11d86da38ff2174ac1f0e7d612 (patch) | |
| tree | 20812a41d73520d58efe2a69f9b2b52b022c980d /MediaBrowser.Model/Configuration/EncodingOptions.cs | |
| parent | cefac4f886e82a642380586b3d732e729cd76dd1 (diff) | |
| parent | cef796a5ba6dd256f425fb87c13d63c724499058 (diff) | |
Merge branch 'master' into sessionmanager
Diffstat (limited to 'MediaBrowser.Model/Configuration/EncodingOptions.cs')
| -rw-r--r-- | MediaBrowser.Model/Configuration/EncodingOptions.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs index 9ae10d980..ff431e44c 100644 --- a/MediaBrowser.Model/Configuration/EncodingOptions.cs +++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs @@ -1,3 +1,6 @@ +#pragma warning disable CS1591 +#pragma warning disable SA1600 + namespace MediaBrowser.Model.Configuration { public class EncodingOptions @@ -8,12 +11,14 @@ namespace MediaBrowser.Model.Configuration public bool EnableThrottling { get; set; } public int ThrottleDelaySeconds { get; set; } public string HardwareAccelerationType { get; set; } + /// <summary> - /// FFmpeg path as set by the user via the UI + /// FFmpeg path as set by the user via the UI. /// </summary> public string EncoderAppPath { get; set; } + /// <summary> - /// The current FFmpeg path being used by the system and displayed on the transcode page + /// The current FFmpeg path being used by the system and displayed on the transcode page. /// </summary> public string EncoderAppPathDisplay { get; set; } public string VaapiDevice { get; set; } |
