diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-02-24 15:07:26 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-02-24 15:07:26 -0500 |
| commit | 868f0afc955de78ddb64f2e4193b0d7ba1106c79 (patch) | |
| tree | 48b8f6d94e3f762a486aa1c4fa6937cf23c18dee | |
| parent | e5e73f82fa2e0b0f2b7d9206a81dffd93b088b21 (diff) | |
3.2.3.1
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 2 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
2 files changed, 2 insertions, 2 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) { diff --git a/SharedVersion.cs b/SharedVersion.cs index 5e662ebe6..069f6e9fc 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.2.1")] +[assembly: AssemblyVersion("3.2.3.1")] |