mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-21 13:10:45 +02:00
Merge pull request #3699 from oddstr13/pr-embedded-subs-1
Fix embedded subtitles
This commit is contained in:
commit
bfecfab538
|
@ -174,7 +174,13 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
inputFiles = new[] { mediaSource.Path };
|
inputFiles = new[] { mediaSource.Path };
|
||||||
}
|
}
|
||||||
|
|
||||||
var fileInfo = await GetReadableFile(mediaSource.Path, inputFiles, _mediaSourceManager.GetPathProtocol(subtitleStream.Path), subtitleStream, cancellationToken).ConfigureAwait(false);
|
var protocol = mediaSource.Protocol;
|
||||||
|
if (subtitleStream.IsExternal)
|
||||||
|
{
|
||||||
|
protocol = _mediaSourceManager.GetPathProtocol(subtitleStream.Path);
|
||||||
|
}
|
||||||
|
|
||||||
|
var fileInfo = await GetReadableFile(mediaSource.Path, inputFiles, protocol, subtitleStream, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
var stream = await GetSubtitleStream(fileInfo.Path, fileInfo.Protocol, fileInfo.IsExternal, cancellationToken).ConfigureAwait(false);
|
var stream = await GetSubtitleStream(fileInfo.Path, fileInfo.Protocol, fileInfo.IsExternal, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue