Merge pull request #1005 from MediaBrowser/dev

3.0.5518.0

1 files changed, 7 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
index a988c2f97..fe0fb3295 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
@@ -5,6 +5,7 @@ namespace MediaBrowser.Controller.MediaEncoding
     public class EncodingJobOptions
     {
         public string OutputContainer { get; set; }
+        public string OutputDirectory { get; set; }
 
         public long? StartTimeTicks { get; set; }
         public int? Width { get; set; }
@@ -80,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;
+            }
         }
     }
 }