From 47d150565d7c7eeffc037be5736f99d9e850b143 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sun, 15 May 2022 20:25:01 -0400 Subject: [PATCH] Merge pull request #7712 from jellyfin/fix-hevc-disable-option (cherry picked from commit 5a9e5e0d5dc9179dd816f7ec93cc21dc8a02468a) Signed-off-by: crobibero --- MediaBrowser.Model/Dlna/StreamBuilder.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index ce75e678ea..fe9ff2ebe8 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -771,7 +771,14 @@ namespace MediaBrowser.Model.Dlna // Prefer matching video codecs var videoCodecs = ContainerProfile.SplitValue(videoCodec); var directVideoCodec = ContainerProfile.ContainsContainer(videoCodecs, videoStream?.Codec) ? videoStream?.Codec : null; - playlistItem.VideoCodecs = directVideoCodec != null ? new[] { directVideoCodec } : videoCodecs; + if (directVideoCodec != null) + { + // merge directVideoCodec to videoCodecs + Array.Resize(ref videoCodecs, videoCodecs.Length + 1); + videoCodecs[^1] = directVideoCodec; + } + + playlistItem.VideoCodecs = videoCodecs; // Copy video codec options as a starting point, this applies to transcode and direct-stream playlistItem.MaxFramerate = videoStream?.AverageFrameRate;