diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-09-29 17:19:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-29 17:19:23 -0400 |
| commit | dcc8c7b92a546274c92711e1ebdbb022b6704984 (patch) | |
| tree | 079876fe93ae7c135d00fa87ff67ca35a2441b88 | |
| parent | f63d591b08986d31eaaca5e3a5ef23ded58f5d38 (diff) | |
| parent | 7fd75bf0715564c996028d7dedc98bb3095180a3 (diff) | |
Merge pull request #1808 from joshuaboniface/fix-amf-win
Change Win32 AMF flag to d3d11va
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 46088667a..991fc0b00 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -2545,7 +2545,10 @@ namespace MediaBrowser.Controller.MediaEncoding { if (Environment.OSVersion.Platform == PlatformID.Win32NT) { - return "-hwaccel dxva2"; + if(Environment.OSVersion.Version.Major > 6 || (Environment.OSVersion.Version.Major == 6 && Environment.OSVersion.Version.Minor > 1)) + return "-hwaccel d3d11va"; + else + return "-hwaccel dxva2"; } switch (videoStream.Codec.ToLowerInvariant()) |