Merge pull request #8078 from Andy2244/fix-stream_copy
This commit is contained in:
commit
47c2c536e4
|
@ -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 New Issue
Block a user