diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-15 00:34:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-15 00:34:33 -0400 |
| commit | a4efcf07f42d1ccd2be0c2f4d2af1208366f6ab6 (patch) | |
| tree | c4d0a9693850b977b66c057508b286ed50da9a3c /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | e2085763296e32e7ef1532460030e5449725116a (diff) | |
| parent | 4a8aa20698aa761cba7ab7e45181a2b3251fca64 (diff) | |
Merge pull request #2639 from MediaBrowser/beta
Beta
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 11311905c..29d37f99b 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1749,7 +1749,8 @@ namespace MediaBrowser.Controller.MediaEncoding { if (!string.IsNullOrWhiteSpace(encodingOptions.HardwareAccelerationType)) { - return "-hwaccel auto"; + // causing unpredictable results + //return "-hwaccel auto"; } if (string.Equals(encodingOptions.HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase)) |