starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-20 07:45:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into trickplay

Browse Source
This commit is contained in:
Nick
2023-06-28 21:43:23 -07:00
parent fc61933748 76939bbd9b
commit 6d9e43cfe0
34 changed files with 684 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Model/Configuration/EncodingOptions.cs
View File

@@ -49,6 +49,7 @@ public class EncodingOptions
EnableIntelLowPowerHevcHwEncoder = false;
EnableHardwareEncoding = true;
AllowHevcEncoding = false;
AllowAv1Encoding = false;
AllowMjpegEncoding = false;
EnableSubtitleExtraction = true;
AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = new[] { "mkv" };
@@ -250,6 +251,11 @@ public class EncodingOptions
/// </summary>
public bool AllowHevcEncoding { get; set; }
/// <summary>
/// Gets or sets a value indicating whether AV1 encoding is enabled.
/// </summary>
public bool AllowAv1Encoding { get; set; }
/// <summary>
/// Gets or sets a value indicating whether MJPEG encoding is enabled.
/// </summary>