diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-04-21 16:04:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-21 16:04:24 -0400 |
| commit | 82b86449cb4083ab8d875b22f40beb93d2f821f8 (patch) | |
| tree | b81c447168b9e574effd3ee6ca1d69fa57dcdf21 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 26b655b37b0a393f3e400b69ed6915dab76ffd0e (diff) | |
| parent | 1a601e32fd3a29e26f693a7a43c06f2f5f9986ca (diff) | |
Merge pull request #2593 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 22d09f34a..d6e4a61e4 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1725,6 +1725,11 @@ namespace MediaBrowser.Controller.MediaEncoding if (state.VideoStream != null && !string.IsNullOrWhiteSpace(state.VideoStream.Codec)) { + if (!string.IsNullOrWhiteSpace(encodingOptions.HardwareAccelerationType)) + { + return "-hwaccel auto"; + } + if (string.Equals(encodingOptions.HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase)) { switch (state.MediaSource.VideoStream.Codec.ToLower()) |