diff options
| author | Cody Robibero <cody@robibe.ro> | 2022-04-12 13:41:21 -0600 |
|---|---|---|
| committer | Joshua Boniface <joshua@boniface.me> | 2022-04-17 15:45:11 -0400 |
| commit | fe3dbabbff5aa4654c673eea13f225d311286b48 (patch) | |
| tree | 6611580b05a30d62c494aa8795f637fcf4329808 | |
| parent | 09ea59e1d5643ec03aac74ddd5674e10d2a15786 (diff) | |
Merge pull request #7580 from jellyfin/external-audio-map
(cherry picked from commit c5212a20a314adb3cf654bc1a08f03933377e519)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 5030d55f6..162a821f5 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -2244,7 +2244,8 @@ namespace MediaBrowser.Controller.MediaEncoding { if (state.AudioStream.IsExternal) { - int externalAudioMapIndex = state.SubtitleStream != null && state.SubtitleStream.IsExternal ? 2 : 1; + bool hasExternalGraphicsSubs = state.SubtitleStream != null && state.SubtitleStream.IsExternal && !state.SubtitleStream.IsTextSubtitleStream; + int externalAudioMapIndex = hasExternalGraphicsSubs ? 2 : 1; int externalAudioStream = state.MediaSource.MediaStreams.Where(i => i.Path == state.AudioStream.Path).ToList().IndexOf(state.AudioStream); args += string.Format( |