aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
diff options
context:
space:
mode:
authorgnattu <gnattu@users.noreply.github.com>2024-06-01 18:41:04 -0400
committerJoshua M. Boniface <joshua@boniface.me>2024-06-01 18:41:04 -0400
commitb123f7ffcd639a5be1c0cb996c9e44829ca6afa9 (patch)
tree1142df692237b450d94201c981eebb424a4c86ea /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
parent9563e4f85ea6bdd3410dae2a7d48ea0664fe606c (diff)
Backport pull request #11851 from jellyfin/release-10.9.z
Relax remuxing requirement for LiveTV Original-merge: 0392daa10397c40d62e2068cd85e030d9ca2d898 Merged-by: crobibero <cody@robibe.ro> Backported-by: Joshua M. Boniface <joshua@boniface.me>
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index e4ec7a4e3..6c2b5bf71 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2320,7 +2320,11 @@ namespace MediaBrowser.Controller.MediaEncoding
if (request.VideoBitRate.HasValue
&& (!videoStream.BitRate.HasValue || videoStream.BitRate.Value > request.VideoBitRate.Value))
{
- return false;
+ // For LiveTV that has no bitrate, let's try copy if other conditions are met
+ if (string.IsNullOrWhiteSpace(request.LiveStreamId) || videoStream.BitRate.HasValue)
+ {
+ return false;
+ }
}
var maxBitDepth = state.GetRequestedVideoBitDepth(videoStream.Codec);