aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/Configuration/EncodingOptions.cs
diff options
context:
space:
mode:
authorAnthony Lavado <anthony@lavado.ca>2020-02-12 02:01:56 -0500
committerGitHub <noreply@github.com>2020-02-12 02:01:56 -0500
commit42066ee326277fb181f609a8530cf419569efbf8 (patch)
tree4c119429d3689c03ed267880a4257cb6402c45ae /MediaBrowser.Model/Configuration/EncodingOptions.cs
parent081d942d0361a4ad8aa918edcbb2f20c4c3f8471 (diff)
parent684568e6d2ef163c91fa5faf26600c16acf4b0b8 (diff)
Merge branch 'master' into transcoding-throttling
Diffstat (limited to 'MediaBrowser.Model/Configuration/EncodingOptions.cs')
-rw-r--r--MediaBrowser.Model/Configuration/EncodingOptions.cs9
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; }