Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-21 21:20:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1314 from MediaBrowser/master

Browse source 
merge from master
This commit is contained in:
Luke 2015-12-14 16:59:03 -05:00
parent 5c03b0d769 566f1f0ad8
commit d85c3f3a33
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
View file

@ -514,10 +514,7 @@ namespace MediaBrowser.Api.Playback.Hls
// Main stream
var playlistUrl = isLiveStream ? "live.m3u8" : "main.m3u8";
if ((Request.UserAgent ?? string.Empty).IndexOf("roku", StringComparison.OrdinalIgnoreCase) == -1)
{
playlistUrl += queryString;
}
playlistUrl += queryString;
var request = state.Request;
@ -704,6 +701,11 @@ namespace MediaBrowser.Api.Playback.Hls
var queryStringIndex = Request.RawUrl.IndexOf('?');
var queryString = queryStringIndex == -1 ? string.Empty : Request.RawUrl.Substring(queryStringIndex);
if ((Request.UserAgent ?? string.Empty).IndexOf("roku", StringComparison.OrdinalIgnoreCase) != -1)
{
queryString = string.Empty;
}
var index = 0;
foreach (var length in segmentLengths)