1 files changed, 12 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index eacd7999c..64862da60 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -2178,7 +2178,18 @@ namespace MediaBrowser.Api.Playback
                 inputModifier += " " + videoDecoder;
             }
 
-            //inputModifier += " -noaccurate_seek";
+            if (state.VideoRequest != null)
+            {
+                var videoCodec = GetVideoEncoder(state);
+                // See if we can save come cpu cycles by avoiding encoding
+                if (string.Equals(videoCodec, "copy", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (string.Equals(state.OutputContainer, "mkv", StringComparison.OrdinalIgnoreCase))
+                    {
+                        inputModifier += " -noaccurate_seek";
+                    }
+                }
+            }
             
             return inputModifier;
         }