diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-08-23 13:35:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-23 13:35:13 -0400 |
| commit | 629902fd75e25bbd1ca4d585dff32782123063a1 (patch) | |
| tree | 550926d3000fc12ae8795b3b804a49163e861bbd /MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs | |
| parent | cd5aaa364d38d91bfbe384392a39f67d7660b2e9 (diff) | |
| parent | 2e65c32ededcfe67dbfb345270b55e1f3d816edc (diff) | |
Merge pull request #2093 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs index ba7b14950..b5e97f09a 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs @@ -586,6 +586,10 @@ namespace MediaBrowser.MediaEncoding.Encoder { return GetAvailableEncoder(mediaEncoder, "h264_omx", defaultEncoder); } + if (string.Equals(hwType, "vaapi", StringComparison.OrdinalIgnoreCase)) + { + return GetAvailableEncoder(mediaEncoder, "h264_vaapi", defaultEncoder); + } } return defaultEncoder; |