aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
diff options
context:
space:
mode:
authorp27ZuH6CNAdzr <317456640+p27ZuH6CNAdzr@users.noreply.github.com>2026-10-13 13:36:11 -0400
committerBond_009 <bond.009@outlook.com>2026-10-13 13:36:11 -0400
commitf624cb4cc54826d4fc5c56dc2de9120a0ea632ce (patch)
tree0e1da1a48bf1c653fb08a49c29815be58cbbd34c /MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
parent054706333d0c76b2fe676c91fbdf19b39d3d7b8b (diff)
Backport pull request #18309 from jellyfin/release-12.z
Fix crash when a subtitle charset has no .NET encoding Original-merge: 2f5be2df9be3d9ef44af4bf787a063f4d4166629 Merged-by: Bond-009 <bond.009@outlook.com> Backported-by: Bond_009 <bond.009@outlook.com>
Diffstat (limited to 'MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index fba644b74a..27a987fefe 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -188,6 +188,14 @@ namespace MediaBrowser.MediaEncoding.Subtitles
_logger.LogDebug("charset {CharSet} detected for {Path}", detected.EncodingName, fileInfo.Path);
+ // If encoding is not supported by .NET (e.g., ISO-8859-16), return stream as-is
+ // The charset name will be passed to ffmpeg via -sub_charenc if needed
+ if (detected.Encoding is null)
+ {
+ _logger.LogWarning("Encoding {Encoding} is not supported by .NET for {Path}, returning stream as-is", detected.EncodingName, fileInfo.Path);
+ return stream;
+ }
+
await using (stream.ConfigureAwait(false))
{
using var reader = new StreamReader(stream, detected.Encoding);