Merge pull request #1808 from joshuaboniface/fix-amf-win

Change Win32 AMF flag to d3d11va
5 years ago · dcc8c7b92a
parent f63d591b08 7fd75bf071
commit dcc8c7b92a
1 changed files with 4 additions and 1 deletions
--- 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())