aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/Dlna
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-09-12 12:39:24 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-09-12 12:39:24 -0400
commit0f743205c4835d828de9f28f6ab7d325209e83b2 (patch)
treeb98f87ef9978797c424a394fb6d0d411bcf66e5d /MediaBrowser.Model/Dlna
parentdd17096b5d60e24f88f8f0c21227961d54587f6f (diff)
update external subs
Diffstat (limited to 'MediaBrowser.Model/Dlna')
-rw-r--r--MediaBrowser.Model/Dlna/StreamBuilder.cs12
1 files changed, 5 insertions, 7 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index e0cc1b705c..810d42a095 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -759,14 +759,12 @@ namespace MediaBrowser.Model.Dlna
if (profile.Method == SubtitleDeliveryMethod.External && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
{
- if (!requiresConversion)
+ if (subtitleStream.IsTextSubtitleStream || !requiresConversion)
{
- return profile;
- }
-
- if (subtitleStream.SupportsExternalStream)
- {
- return profile;
+ if (subtitleStream.SupportsExternalStream)
+ {
+ return profile;
+ }
}
// For sync we can handle the longer extraction times