aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2026-05-03 12:17:12 +0200
committerGitHub <noreply@github.com>2026-05-03 12:17:12 +0200
commitdf6f706c2f632b9e1eeeabccf5511ab24f317633 (patch)
tree3130ef9aeb8296a1283c72e96adc53194ad5273b /MediaBrowser.MediaEncoding
parent3aed4291207f4bc07af923609dbae86527ab9dda (diff)
parente75f7f1b28f8a6813421efcf0db4162daf5cf6d8 (diff)
Merge pull request #16744 from nyanmisaka/skip-ssa-to-ass-conv
Avoid SSA to ASS conversion and loss of styles
Diffstat (limited to 'MediaBrowser.MediaEncoding')
-rw-r--r--MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs5
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;
}