aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-03-07 22:21:44 -0500
committerLuke <luke.pulverenti@gmail.com>2016-03-07 22:21:44 -0500
commit2b060987c68c3f353a22624772b9913de94acb5a (patch)
tree2e3ddd8609289cbeaf8ba7e92f471d79162dc549 /MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
parent5ad849c8a73b1316c95c8edf62d9cc0f683c343f (diff)
parent3c4b64f6533721f3cb177a77967f154b90ee33cc (diff)
Merge pull request #1538 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
index f8f4e9ec9..ddaf7ff6d 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
@@ -90,8 +90,7 @@ namespace MediaBrowser.Controller.MediaEncoding
Cabac = info.Cabac;
Context = info.Context;
- if (info.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode ||
- info.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Embed)
+ if (info.SubtitleDeliveryMethod != SubtitleDeliveryMethod.External)
{
SubtitleStreamIndex = info.SubtitleStreamIndex;
}