alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-08 16:58:50 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix-external-sub-invalidation

Browse Source
This commit is contained in:
Shadowghost
2026-06-05 21:26:08 +02:00
parent efb0336369 1a2db53710
commit a96824f257
8 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View File

@@ -215,7 +215,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
}
// Normalize ffmpeg codec names to the file extensions the parser is keyed on
var currentFormat = NormalizeCodecToParserExtension(subtitleStream.Codec ?? Path.GetExtension(subtitleStream.Path).TrimStart('.'));
var currentFormat = NormalizeCodecToParserExtension((Path.GetExtension(subtitleStream.Path) ?? subtitleStream.Codec).TrimStart('.'));
// Handle PGS subtitles as raw streams for the client to render
if (MediaStream.IsPgsFormat(currentFormat))