diff options
| author | Anthony Lavado <anthony@lavado.ca> | 2020-07-26 15:36:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 15:36:29 -0700 |
| commit | bfecfab53862d75b90f29f281f391dadbc5b6472 (patch) | |
| tree | 18e1c8edde5933ad723cc93c1ae9041c43853a86 | |
| parent | 468a7fea4cd17bd149c64ed51e928c3ebc148fdf (diff) | |
| parent | 591fcf7ff26d338975deec3d36f7d2297af9cec2 (diff) | |
Merge pull request #3699 from oddstr13/pr-embedded-subs-1
Fix embedded subtitles
| -rw-r--r-- | MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 8e6543d80..f850f5c2e 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -174,7 +174,13 @@ namespace MediaBrowser.MediaEncoding.Subtitles 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); |
