aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-07-03 20:42:22 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-07-03 20:42:22 -0400
commit0a5db9f2d7ac6bd54c9dfcf208e5d430070af676 (patch)
treebaab6612abcd9bb9472f55e18131951cc991dca3
parentfcc64173f6528e5252079f870afbc5d80bd90bb5 (diff)
parent6e1ba4e3cc88868304bf8c08baefb70b79c8838d (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 89e62ed9b..27b675294 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -341,7 +341,7 @@ namespace MediaBrowser.Api.Playback
// h264 (h264_nvenc)
else if (string.Equals(videoCodec, "h264_nvenc", StringComparison.OrdinalIgnoreCase))
{
- param = "-preset high-performance";
+ param = "-preset default";
}
// webm