Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-08-07 09:01:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2653 from iwalton3/fix-embedded-subtitles

Browse Source 
Fix embedded mkv subtitles.

(cherry picked from commit 1345e699fae6e29b4507c5ed3dbddd36523a5e0d)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Bond-009 2020-03-24 22:04:16 +01:00 committed by Joshua M. Boniface
parent 4caa597cde
commit 9da2635d86
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,9 +183,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles
private async Task<Stream> GetSubtitleStream(string path, MediaProtocol protocol, bool requiresCharset, CancellationToken cancellationToken) private async Task<Stream> GetSubtitleStream(string path, MediaProtocol protocol, bool requiresCharset, CancellationToken cancellationToken)
{ {
using (var stream = await GetStream(path, protocol, cancellationToken).ConfigureAwait(false)) if (requiresCharset)
{ {
if (requiresCharset) using (var stream = await GetStream(path, protocol, cancellationToken).ConfigureAwait(false))
{ {
var result = CharsetDetector.DetectFromStream(stream).Detected; var result = CharsetDetector.DetectFromStream(stream).Detected;
stream.Position = 0; stream.Position = 0;
@ -200,9 +200,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles
return new MemoryStream(Encoding.UTF8.GetBytes(text)); return new MemoryStream(Encoding.UTF8.GetBytes(text));
} }
} }
return stream;
} }
return File.OpenRead(path);
} }
private async Task<SubtitleInfo> GetReadableFile( private async Task<SubtitleInfo> GetReadableFile(