diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-08-24 11:49:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 11:49:22 -0400 |
| commit | 20c400fee3c55b64ff8b71b166b8a249d5c25301 (patch) | |
| tree | 44409ac47142998dd8866bc580d5594846dca72b /MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs | |
| parent | f4bc4f473ac8567df5473443d7453c8afa34bdf5 (diff) | |
| parent | e03ead01aea85fdc2ace162ab4daa94248ec6909 (diff) | |
Merge pull request #2095 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs index b5e97f09a..c72532669 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs @@ -586,7 +586,7 @@ namespace MediaBrowser.MediaEncoding.Encoder { return GetAvailableEncoder(mediaEncoder, "h264_omx", defaultEncoder); } - if (string.Equals(hwType, "vaapi", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(hwType, "vaapi", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrWhiteSpace(options.VaapiDevice)) { return GetAvailableEncoder(mediaEncoder, "h264_vaapi", defaultEncoder); } |