diff options
| author | KGT1 <kilian.gamn@gmx.de> | 2026-05-03 22:35:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-03 22:35:57 +0200 |
| commit | 4464b2e2ed9d8cc3f4c520ee76dfedac3557cf0d (patch) | |
| tree | 4fdf6dc5fff74c21b3b2cd74c1d3d5fd695b0638 /MediaBrowser.MediaEncoding/Subtitles | |
| parent | 950c6525d1ab456115c4ee80b8fed86c5a81eaf5 (diff) | |
| parent | 622947e37425f3620432995cde5d4a0809d91694 (diff) | |
Merge branch 'jellyfin:master' into removeGenericConfigurationEndpoint
Diffstat (limited to 'MediaBrowser.MediaEncoding/Subtitles')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 5920fe3289..894d0a3574 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -147,7 +147,10 @@ namespace MediaBrowser.MediaEncoding.Subtitles // Return the original if the same format is being requested // Character encoding was already handled in GetSubtitleStream - if (string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase)) + // ASS is a superset of SSA, skipping the conversion and preserving the styles + if (string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase) + || (string.Equals(inputFormat, SubtitleFormat.SSA, StringComparison.OrdinalIgnoreCase) + && string.Equals(outputFormat, SubtitleFormat.ASS, StringComparison.OrdinalIgnoreCase))) { return stream; } |
