From be21d51742f3bd85f5401c925791148bdc4b0cbf Mon Sep 17 00:00:00 2001
From: gnattu <gnattu@users.noreply.github.com>
Date: Thu, 28 Mar 2024 23:26:01 +0800
Subject: fix: move trickplay specific option into TrickplayOptions (#11229)

---
 MediaBrowser.Model/Configuration/EncodingOptions.cs  | 6 ------
 MediaBrowser.Model/Configuration/TrickplayOptions.cs | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'MediaBrowser.Model/Configuration')

diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index ab6f0d867..9a192f584 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -51,7 +51,6 @@ public class EncodingOptions
         EnableHardwareEncoding = true;
         AllowHevcEncoding = false;
         AllowAv1Encoding = false;
-        AllowMjpegEncoding = false;
         EnableSubtitleExtraction = true;
         AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = new[] { "mkv" };
         HardwareDecodingCodecs = new string[] { "h264", "vc1" };
@@ -262,11 +261,6 @@ public class EncodingOptions
     /// </summary>
     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>
diff --git a/MediaBrowser.Model/Configuration/TrickplayOptions.cs b/MediaBrowser.Model/Configuration/TrickplayOptions.cs
index 92c16ee84..a151d3429 100644
--- a/MediaBrowser.Model/Configuration/TrickplayOptions.cs
+++ b/MediaBrowser.Model/Configuration/TrickplayOptions.cs
@@ -13,6 +13,11 @@ public class TrickplayOptions
     /// </summary>
     public bool EnableHwAcceleration { get; set; } = false;
 
+    /// <summary>
+    /// Gets or sets a value indicating whether or not to use HW accelerated MJPEG encoding.
+    /// </summary>
+    public bool EnableHwEncoding { get; set; } = false;
+
     /// <summary>
     /// Gets or sets the behavior used by trickplay provider on library scan/update.
     /// </summary>
-- 
cgit v1.2.3