aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-12-14 09:45:39 -0500
committerLuke <luke.pulverenti@gmail.com>2015-12-14 09:45:39 -0500
commitbc4591923793c226aa5c1086ffe8e26b12a2ffa3 (patch)
treee504368eb1ab65f0052b914dcc12fe0f58b6033a /MediaBrowser.Server.Implementations/Library
parent4679f0aed6c57f725ec5fc441e9a20588f288b6d (diff)
parent1bd9ae86099899af3e095a21d4e62fe0d142704e (diff)
Merge pull request #1305 from MediaBrowser/master
merge from master
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library')
-rw-r--r--MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs13
1 files changed, 1 insertions, 12 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index 2105f1a47..6bc1af591 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -68,23 +68,12 @@ namespace MediaBrowser.Server.Implementations.Library
if (stream.IsTextSubtitleStream)
{
- return InternalTextStreamSupportsExternalStream(stream);
+ return true;
}
return false;
}
- private bool InternalTextStreamSupportsExternalStream(MediaStream stream)
- {
- // These usually have styles and fonts that won't convert to text very well
- if (string.Equals(stream.Codec, "ass", StringComparison.OrdinalIgnoreCase))
- {
- return false;
- }
-
- return true;
- }
-
public IEnumerable<MediaStream> GetMediaStreams(string mediaSourceId)
{
var list = GetMediaStreams(new MediaStreamQuery