aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Boniface <joshua@boniface.me>2022-07-20 19:29:06 -0400
committerJoshua Boniface <joshua@boniface.me>2022-07-20 19:29:06 -0400
commita9449d0f23db890d8a251504afa1b262dae2a513 (patch)
treedf81d162bbb381d4b2ce8f0bafeed0e3302344f9
parentb7206b4816b5faf697035d2a80554069e452edfb (diff)
Backport pull request #8078 from jellyfin/release-10.8.z
fix copy&paste error for requestedRangeTypes preventing stream copy Authored-by: Andy Walsh <andy.walsh44+github@gmail.com> Merged-by: Bond-009 <bond.009@outlook.com> Original-merge: 47c2c536e45792ffe0b5c70d02758463e0c1d407
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 6fb5c8874..684ea157f 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1713,6 +1713,7 @@ namespace MediaBrowser.Controller.MediaEncoding
// Can't stream copy if we're burning in subtitles
if (request.SubtitleStreamIndex.HasValue
+ && request.SubtitleStreamIndex.Value >= 0
&& state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode)
{
return false;
@@ -1760,7 +1761,7 @@ namespace MediaBrowser.Controller.MediaEncoding
}
var requestedRangeTypes = state.GetRequestedRangeTypes(videoStream.Codec);
- if (requestedProfiles.Length > 0)
+ if (requestedRangeTypes.Length > 0)
{
if (string.IsNullOrEmpty(videoStream.VideoRangeType))
{