diff options
| author | Vasily <JustAMan@users.noreply.github.com> | 2020-03-31 23:19:44 +0300 |
|---|---|---|
| committer | Joshua M. Boniface <joshua@boniface.me> | 2020-04-05 12:51:08 -0400 |
| commit | bf0c07abfe494211858362f458e3780f5e6c5bb3 (patch) | |
| tree | fa1b88da595c22d826c7e972b086a8d75a3f8400 /MediaBrowser.MediaEncoding | |
| parent | 3a4cd01b136e31bbdaaca293f84589852ad934e9 (diff) | |
Merge pull request #2503 from nyanmisaka/vaapi
Fix various bugs in HWA subtitle burn-in
(cherry picked from commit 9aefb41512e8e2655c9c894180907d8ae60ae30e)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
Diffstat (limited to 'MediaBrowser.MediaEncoding')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 6284e0fd9..f7ed9fb1a 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -731,6 +731,14 @@ namespace MediaBrowser.MediaEncoding.Subtitles { var charset = CharsetDetector.DetectFromStream(stream).Detected?.EncodingName; + // UTF16 is automatically converted to UTF8 by FFmpeg, do not specify a character encoding + if ((path.EndsWith(".ass") || path.EndsWith(".ssa")) + && (string.Equals(charset, "utf-16le", StringComparison.OrdinalIgnoreCase) + || string.Equals(charset, "utf-16be", StringComparison.OrdinalIgnoreCase))) + { + charset = ""; + } + _logger.LogDebug("charset {0} detected for {Path}", charset ?? "null", path); return charset; |