aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-11-18 12:52:16 -0500
committerGitHub <noreply@github.com>2016-11-18 12:52:16 -0500
commit9ff2d7590e7f34f26803cf658d20faeae6d9ecdb (patch)
tree612092edc128b95ba04e4c309a0379ac22fcfe9c /MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
parent0accbd194a191ce750b48a00c8a4f00786fe187d (diff)
parente0c72b605dbe124e111be9bff5cca442f86cf1ef (diff)
Merge pull request #2294 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 9b31a1012..0bbc2d916 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -141,8 +141,14 @@ namespace MediaBrowser.MediaEncoding.Subtitles
.ConfigureAwait(false);
var inputFormat = subtitle.Item2;
+ var writer = TryGetWriter(outputFormat);
- if (string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase) && TryGetWriter(outputFormat) == null)
+ if (string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase) && writer == null)
+ {
+ return subtitle.Item1;
+ }
+
+ if (writer == null)
{
return subtitle.Item1;
}