michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #2907 from MediaBrowser/dev

Browse Source 
fix application of params
This commit is contained in:
Luke 2017-09-22 16:39:56 -04:00 committed by GitHub
commit 0b72b3b1a7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@ -795,6 +795,8 @@ namespace MediaBrowser.Model.Dlna
if (applyConditions) if (applyConditions)
{ {
foreach (var transcodingVideoCodec in ContainerProfile.SplitValue(transcodingProfile.VideoCodec)) foreach (var transcodingVideoCodec in ContainerProfile.SplitValue(transcodingProfile.VideoCodec))
{
if (i.ContainsCodec(transcodingVideoCodec, transcodingProfile.Container))
{ {
ApplyTranscodingConditions(playlistItem, i.Conditions, transcodingVideoCodec, !isFirstAppliedCodecProfile); ApplyTranscodingConditions(playlistItem, i.Conditions, transcodingVideoCodec, !isFirstAppliedCodecProfile);
isFirstAppliedCodecProfile = false; isFirstAppliedCodecProfile = false;
@ -802,6 +804,7 @@ namespace MediaBrowser.Model.Dlna
} }
} }
} }
}
var audioTranscodingConditions = new List<ProfileCondition>(); var audioTranscodingConditions = new List<ProfileCondition>();
foreach (CodecProfile i in options.Profile.CodecProfiles) foreach (CodecProfile i in options.Profile.CodecProfiles)