diff options
| author | Shadowghost <Ghost_of_Stone@web.de> | 2026-05-30 19:07:18 +0200 |
|---|---|---|
| committer | Shadowghost <Ghost_of_Stone@web.de> | 2026-05-30 19:09:11 +0200 |
| commit | a479e145dc1b31c0babd27994122dde0dbc6e9cb (patch) | |
| tree | 8ccdb724ec610ea0ccbf5510b3b388a0c0e5c682 /MediaBrowser.Model/Configuration/EncodingOptions.cs | |
| parent | cb9d6e9884d3b952321736392801743198b0ccd9 (diff) | |
| parent | 99e9b2310f8a2c2a8bc630b31243df63507b1e17 (diff) | |
Merge remote-tracking branch 'upstream/master' into search-rebased
# Conflicts:
# Emby.Server.Implementations/Library/LibraryManager.cs
# Jellyfin.Server.Implementations/Item/PeopleRepository.cs
# MediaBrowser.Controller/Library/ILibraryManager.cs
# MediaBrowser.Controller/Persistence/IPeopleRepository.cs
Diffstat (limited to 'MediaBrowser.Model/Configuration/EncodingOptions.cs')
| -rw-r--r-- | MediaBrowser.Model/Configuration/EncodingOptions.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs index 98fc2e632f..f5bb5330ed 100644 --- a/MediaBrowser.Model/Configuration/EncodingOptions.cs +++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs @@ -61,7 +61,7 @@ public class EncodingOptions SubtitleExtractionTimeoutMinutes = 30; AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = ["mkv"]; HardwareDecodingCodecs = ["h264", "vc1"]; - HlsAudioSeekStrategy = HlsAudioSeekStrategy.DisableAccurateSeek; + HlsAudioSeekStrategy = HlsAudioSeekStrategy.TrimCopiedAudio; } /// <summary> @@ -307,6 +307,6 @@ public class EncodingOptions /// <summary> /// Gets or sets the method used for audio seeking in HLS. /// </summary> - [DefaultValue(HlsAudioSeekStrategy.DisableAccurateSeek)] + [DefaultValue(HlsAudioSeekStrategy.TrimCopiedAudio)] public HlsAudioSeekStrategy HlsAudioSeekStrategy { get; set; } } |