mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-02-10 22:52:25 +00:00
Merge pull request #3521 from sachk/master
Fix support for mixed-protocol subtitles
(cherry picked from commit 323fc576a5)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
committed by
Joshua M. Boniface
parent
c8539709ac
commit
2fd902f1b2
@@ -172,7 +172,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||
inputFiles = new[] { mediaSource.Path };
|
||||
}
|
||||
|
||||
var fileInfo = await GetReadableFile(mediaSource.Path, inputFiles, mediaSource.Protocol, subtitleStream, cancellationToken).ConfigureAwait(false);
|
||||
var fileInfo = await GetReadableFile(mediaSource.Path, inputFiles, _mediaSourceManager.GetPathProtocol(subtitleStream.Path), subtitleStream, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
var stream = await GetSubtitleStream(fileInfo.Path, fileInfo.Protocol, fileInfo.IsExternal, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user