瀏覽代碼

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

(cherry picked from commit c5212a20a314adb3cf654bc1a08f03933377e519)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
Cody Robibero 3 年之前
父節點
當前提交
fe3dbabbff
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

+ 2 - 1
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -2244,7 +2244,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
             {
                 if (state.AudioStream.IsExternal)
                 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);
                     int externalAudioStream = state.MediaSource.MediaStreams.Where(i => i.Path == state.AudioStream.Path).ToList().IndexOf(state.AudioStream);
 
 
                     args += string.Format(
                     args += string.Format(