diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-01-11 16:03:42 -0500 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-01-11 16:03:42 -0500 |
| commit | 2318764a84525778fdf874c7b682f78a90722342 (patch) | |
| tree | 7e806708c1fd6e59538d2d7e672918a97482ca01 /MediaBrowser.MediaEncoding | |
| parent | 76edf138de9f746738dcf107c51b558b7df0de21 (diff) | |
| parent | 9edca4586a986adfb2ad34ec7e7f2f036de871dc (diff) | |
Merge pull request #975 from MediaBrowser/dev
3.0.5490.1
Diffstat (limited to 'MediaBrowser.MediaEncoding')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 3b8663b61..4f8b6c6ac 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -700,17 +700,17 @@ namespace MediaBrowser.MediaEncoding.Subtitles /// <returns>System.String.</returns> public string GetSubtitleFileCharacterSet(string path, string language) { - var charset = DetectCharset(path); + //var charset = DetectCharset(path); - if (!string.IsNullOrWhiteSpace(charset)) - { - if (string.Equals(charset, "utf-8", StringComparison.OrdinalIgnoreCase)) - { - //return null; - } + //if (!string.IsNullOrWhiteSpace(charset)) + //{ + // if (string.Equals(charset, "utf-8", StringComparison.OrdinalIgnoreCase)) + // { + // return null; + // } - //return charset; - } + // return charset; + //} if (GetFileEncoding(path).Equals(Encoding.UTF8)) { |