diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2022-05-15 20:25:01 -0400 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2022-05-20 18:30:57 -0400 |
| commit | 47d150565d7c7eeffc037be5736f99d9e850b143 (patch) | |
| tree | 67d81508cbc23d5e566992340b96635f8e0ed39e | |
| parent | 2d8f7b46f11ee458fe0b31d8e1473aaaea9cf296 (diff) | |
Merge pull request #7712 from jellyfin/fix-hevc-disable-option
(cherry picked from commit 5a9e5e0d5dc9179dd816f7ec93cc21dc8a02468a)
Signed-off-by: crobibero <cody@robibe.ro>
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index ce75e678e..fe9ff2ebe 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; |