aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-07-10 22:23:28 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-07-10 22:23:28 -0400
commitfe7fd7cd266be0fe8c0cc2be095cc0b267931ea9 (patch)
tree9cba4db7741db461cd7995d39d30d70483f7ae6d /MediaBrowser.Model
parent6270f4c912a959730cb302d979aa9fba8fa38ec2 (diff)
3.0.5666.5
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Dlna/StreamBuilder.cs8
1 files changed, 1 insertions, 7 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 5a9b3f1b1..340af3ac1 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -753,10 +753,9 @@ namespace MediaBrowser.Model.Dlna
}
}
+ // Look for supported embedded subs that we can just mux into the output
foreach (SubtitleProfile profile in subtitleProfiles)
{
- bool requiresConversion = !StringHelper.EqualsIgnoreCase(subtitleStream.Codec, profile.Format);
-
if (!profile.SupportsLanguage(subtitleStream.Language))
{
continue;
@@ -764,11 +763,6 @@ namespace MediaBrowser.Model.Dlna
if (profile.Method == SubtitleDeliveryMethod.Embed && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
{
- if (!requiresConversion)
- {
- return profile;
- }
-
return profile;
}
}