1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
index ad9ab90a0..fe0fb3295 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
@@ -81,12 +81,17 @@ namespace MediaBrowser.Controller.MediaEncoding
             VideoCodec = info.VideoCodec;
             VideoBitRate = info.VideoBitrate;
             AudioStreamIndex = info.AudioStreamIndex;
-            SubtitleStreamIndex = info.SubtitleStreamIndex;
             MaxRefFrames = info.MaxRefFrames;
             MaxVideoBitDepth = info.MaxVideoBitDepth;
             SubtitleMethod = info.SubtitleDeliveryMethod;
             Cabac = info.Cabac;
             Context = info.Context;
+
+            if (info.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode ||
+                info.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Embed)
+            {
+                SubtitleStreamIndex = info.SubtitleStreamIndex;
+            }
         }
     }
 }