aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-09-22 16:39:56 -0400
committerGitHub <noreply@github.com>2017-09-22 16:39:56 -0400
commit0b72b3b1a73c4bbdd25172348e4e6f82c1ecf946 (patch)
treeac4979c0f1de636c30a593d0daaa4f006ea4ed5a
parenta31006577432efd25de2fe0e32a3900af7b0907a (diff)
parentf3120dbee98894fa5b488acccc611df6ad302540 (diff)
Merge pull request #2907 from MediaBrowser/dev
fix application of params
-rw-r--r--MediaBrowser.Model/Dlna/StreamBuilder.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 130b4c08e4..be0dd8e8df 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -796,8 +796,11 @@ namespace MediaBrowser.Model.Dlna
{
foreach (var transcodingVideoCodec in ContainerProfile.SplitValue(transcodingProfile.VideoCodec))
{
- ApplyTranscodingConditions(playlistItem, i.Conditions, transcodingVideoCodec, !isFirstAppliedCodecProfile);
- isFirstAppliedCodecProfile = false;
+ if (i.ContainsCodec(transcodingVideoCodec, transcodingProfile.Container))
+ {
+ ApplyTranscodingConditions(playlistItem, i.Conditions, transcodingVideoCodec, !isFirstAppliedCodecProfile);
+ isFirstAppliedCodecProfile = false;
+ }
}
}
}