diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-02-24 15:07:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-24 15:07:50 -0500 |
| commit | 66a844e6399f1d79be8e10ea098ba6768e0d123b (patch) | |
| tree | 48b8f6d94e3f762a486aa1c4fa6937cf23c18dee /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | a905945d8b228bec9c4e15a2e964adb334703be2 (diff) | |
| parent | 868f0afc955de78ddb64f2e4193b0d7ba1106c79 (diff) | |
Merge pull request #2488 from MediaBrowser/dev
Dev
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 8407948cf..4e1a0a8d7 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1486,7 +1486,7 @@ namespace MediaBrowser.Controller.MediaEncoding } } - if (state.RunTimeTicks.HasValue) + if (state.RunTimeTicks.HasValue && string.IsNullOrWhiteSpace(encodingOptions.HardwareAccelerationType)) { foreach (var stream in state.MediaSource.MediaStreams) { |