diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-13 17:30:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-13 17:30:44 -0400 |
| commit | 43d91a392fa2a4b5e41c240f2b6fc4082f6a73f9 (patch) | |
| tree | d0620a3e59e99dc40fddc4fdf7f48858532b3a63 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | ec0d22786c7dda19ad45b45ac0d949691de26612 (diff) | |
| parent | 1867fe2e51975fad4afb84c977accf2d08e6e0c9 (diff) | |
Merge pull request #2635 from MediaBrowser/dev
Dev
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)) |