From 509d66dcb501e85afc1d541c8fde7aafc8827eb4 Mon Sep 17 00:00:00 2001 From: SenorSmartyPants Date: Wed, 2 Feb 2022 16:24:10 -0600 Subject: [PATCH] Fix #7147: Don't return subtitles in mismatched format (#7149) --- MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 5b1ec8041e..97b701bb3f 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -141,12 +141,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles var inputFormat = subtitle.Format; - // Return the original if we don't have any way of converting it - if (!TryGetWriter(outputFormat, out var writer)) - { - return subtitle.Stream; - } - // Return the original if the same format is being requested // Character encoding was already handled in GetSubtitleStream if (string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase))