diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-23 18:54:13 -0400 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-23 19:32:40 -0400 |
| commit | cd989381908203e02139d403955cf70c0c818dd8 (patch) | |
| tree | 890d927f09eb310100b1c6f9ad52ddf921271f8a /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 24ed6397250df484b71ebfb3b428d31e4d05f510 (diff) | |
| parent | aa6d52277dfbc074016d7623f114325a5edc3cbe (diff) | |
Merge remote-tracking branch 'upstream/master' into integration-tests
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 8fefdd770..5efb10d3a 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -459,7 +459,7 @@ namespace MediaBrowser.Controller.MediaEncoding { var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, encodingOptions); var outputVideoCodec = GetVideoEncoder(state, encodingOptions); - + var hasTextSubs = state.SubtitleStream != null && state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode; if (!hasTextSubs) |