aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/Configuration/EncodingOptions.cs
diff options
context:
space:
mode:
authorJoshua M. Boniface <joshua@boniface.me>2023-10-19 01:45:42 -0400
committerGitHub <noreply@github.com>2023-10-19 01:45:42 -0400
commit8859a3ac8ea44f1a53668e0a7522cf4c875c4be8 (patch)
treeedc6ad0f1f241c2c3c2cdba5359d4d3006636d33 /MediaBrowser.Model/Configuration/EncodingOptions.cs
parentde08d38a6f2a6e773fa1000574e08322605b56d3 (diff)
parent6b94d55e1ef7ca95e0ddc2a88b0ff0fd63d630a9 (diff)
Merge pull request #9554 from nicknsy/trickplay
Diffstat (limited to 'MediaBrowser.Model/Configuration/EncodingOptions.cs')
-rw-r--r--MediaBrowser.Model/Configuration/EncodingOptions.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 3f0e98ec8..84c735f9c 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -50,6 +50,7 @@ public class EncodingOptions
EnableHardwareEncoding = true;
AllowHevcEncoding = false;
AllowAv1Encoding = false;
+ AllowMjpegEncoding = false;
EnableSubtitleExtraction = true;
AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = new[] { "mkv" };
HardwareDecodingCodecs = new string[] { "h264", "vc1" };
@@ -256,6 +257,11 @@ public class EncodingOptions
public bool AllowAv1Encoding { get; set; }
/// <summary>
+ /// Gets or sets a value indicating whether MJPEG encoding is enabled.
+ /// </summary>
+ public bool AllowMjpegEncoding { get; set; }
+
+ /// <summary>
/// Gets or sets a value indicating whether subtitle extraction is enabled.
/// </summary>
public bool EnableSubtitleExtraction { get; set; }