Merge pull request #2528 from MediaBrowser/dev

update hls to support mpeg2video

1 files changed, 7 insertions, 12 deletions

diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 4a1bf5305..77b976206 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -734,16 +734,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 }
             }
 
-            var charsetFromLanguage = string.IsNullOrWhiteSpace(language)
-                ? null
-                : GetSubtitleFileCharacterSetFromLanguage(language);
-
-            // This assumption should only be made for external subtitles
-            if (!string.IsNullOrWhiteSpace(charsetFromLanguage) && !string.Equals(charsetFromLanguage, "windows-1252", StringComparison.OrdinalIgnoreCase))
-            {
-                return charsetFromLanguage;
-            }
-
             var charset = await DetectCharset(path, language, protocol, cancellationToken).ConfigureAwait(false);
 
             if (!string.IsNullOrWhiteSpace(charset))
@@ -756,7 +746,12 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 return charset;
             }
 
-            return charsetFromLanguage;
+            if (!string.IsNullOrWhiteSpace(language))
+            {
+                return GetSubtitleFileCharacterSetFromLanguage(language);
+            }
+
+            return null;
         }
 
         public string GetSubtitleFileCharacterSetFromLanguage(string language)
@@ -854,4 +849,4 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             throw new ArgumentOutOfRangeException("protocol");
         }
     }
-}
+}
\ No newline at end of file