OpenSource/jellyfin
1
0 Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-10-26 16:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport pull request #18309 from jellyfin/release-12.z

Browse Source 
Fix crash when a subtitle charset has no .NET encoding

Original-merge: 2f5be2df9b

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Bond_009 <bond.009@outlook.com>
This commit is contained in:
p27ZuH6CNAdzr authored and Bond_009 committed 2026-10-13 13:36:11 -04:00
1 parent 054706333d
commit f624cb4cc5
3 files changed
+49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+8
View File
@@ -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);