diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 8407948cf8..4e1a0a8d70 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 5e662ebe61..069f6e9fc3 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")]