diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-03-07 22:21:44 -0500 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-03-07 22:21:44 -0500 |
| commit | 2b060987c68c3f353a22624772b9913de94acb5a (patch) | |
| tree | 2e3ddd8609289cbeaf8ba7e92f471d79162dc549 /MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs | |
| parent | 5ad849c8a73b1316c95c8edf62d9cc0f683c343f (diff) | |
| parent | 3c4b64f6533721f3cb177a77967f154b90ee33cc (diff) | |
Merge pull request #1538 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs index 5756566fe..d1afcc720 100644 --- a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs @@ -88,7 +88,7 @@ namespace MediaBrowser.MediaEncoding.Encoder args += keyFrameArg; - var hasGraphicalSubs = state.SubtitleStream != null && !state.SubtitleStream.IsTextSubtitleStream; + var hasGraphicalSubs = state.SubtitleStream != null && !state.SubtitleStream.IsTextSubtitleStream && state.Options.SubtitleMethod == SubtitleDeliveryMethod.Encode; // Add resolution params, if specified if (!hasGraphicalSubs) |