Merge pull request #7580 from jellyfin/external-audio-map

3 years ago · c5212a20a3
parent 385a0b9437 884ba4f3ed
commit c5212a20a3
1 changed files with 2 additions and 1 deletions
--- 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(