diff options
| -rw-r--r-- | MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 18 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
2 files changed, 10 insertions, 10 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)) { diff --git a/SharedVersion.cs b/SharedVersion.cs index a445daeb4..bbd38b335 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5490.0")] +[assembly: AssemblyVersion("3.0.5490.1")] |