diff options
| author | Anthony Lavado <anthony@lavado.ca> | 2020-06-16 00:07:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 00:07:55 -0400 |
| commit | 25f8e596cb922fc7d98f934777b1a9279c4269a4 (patch) | |
| tree | c7e155825abbae3cd78ffe73c16f81d0f621ca42 /MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | |
| parent | 741db0287a0348399da037804fb8b36c00ec8165 (diff) | |
| parent | dabb869a6b9f1c3359a663fd6b6e380f882e2ae2 (diff) | |
Merge pull request #2809 from nyanmisaka/hwaccel
Add more separate hardware decoding toggles, support videotoolbox
Diffstat (limited to 'MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 7e9894f0a..e35a626d8 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -736,7 +736,7 @@ 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")) + if ((path.EndsWith(".ass") || path.EndsWith(".ssa") || path.EndsWith(".srt")) && (string.Equals(charset, "utf-16le", StringComparison.OrdinalIgnoreCase) || string.Equals(charset, "utf-16be", StringComparison.OrdinalIgnoreCase))) { |