mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-11 08:10:34 +02:00
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: 47c2c536e4
This commit is contained in:
parent
b7206b4816
commit
a9449d0f23
|
@ -1713,6 +1713,7 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
|
|
||||||
// Can't stream copy if we're burning in subtitles
|
// Can't stream copy if we're burning in subtitles
|
||||||
if (request.SubtitleStreamIndex.HasValue
|
if (request.SubtitleStreamIndex.HasValue
|
||||||
|
&& request.SubtitleStreamIndex.Value >= 0
|
||||||
&& state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode)
|
&& state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
@ -1760,7 +1761,7 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
}
|
}
|
||||||
|
|
||||||
var requestedRangeTypes = state.GetRequestedRangeTypes(videoStream.Codec);
|
var requestedRangeTypes = state.GetRequestedRangeTypes(videoStream.Codec);
|
||||||
if (requestedProfiles.Length > 0)
|
if (requestedRangeTypes.Length > 0)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(videoStream.VideoRangeType))
|
if (string.IsNullOrEmpty(videoStream.VideoRangeType))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue