Merge pull request #7712 from jellyfin/fix-hevc-disable-option

3 years ago · 5a9e5e0d5d
parent 3ea67374ae 85cfea4c50
commit 5a9e5e0d5d
1 changed files with 8 additions and 1 deletions
--- 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;