QSV: update WinGUI after previous commit.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/qsv@5361 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
index 9e0ba7b481060840b48ad8bc0e1f88ae0f0ea273..96a12524875e47ed12cb3b62611d4c15be8937eb 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
@@ -340,7 +340,7 @@ namespace HandBrake.ApplicationServices.Utilities
                     return VideoEncoder.X264;\r
                 case "theora":\r
                     return VideoEncoder.Theora;\r
-                case "qsv":\r
+                case "qsv_h264":\r
                     return VideoEncoder.QuickSync;\r
                 default:\r
                     return VideoEncoder.X264;\r
@@ -369,7 +369,7 @@ namespace HandBrake.ApplicationServices.Utilities
                 case VideoEncoder.Theora:\r
                     return "theora";\r
                 case VideoEncoder.QuickSync:\r
-                    return "qsv";\r
+                    return "qsv_h264";\r
                 default:\r
                     return "x264";\r
             }\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 85141ecf5da6731393bfcba5d4f9ca11a80b8398..9e17c0e0b5f13fa5a78f9315971f0ea12ad67824 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -427,7 +427,7 @@ namespace HandBrake.ApplicationServices.Utilities
                     query += " -e ffmpeg2";\r
                     break;\r
                 case VideoEncoder.QuickSync:\r
-                    query += " -e qsv";\r
+                    query += " -e qsv_h264";\r
                     break;\r
                 case VideoEncoder.X264:\r
                     query += " -e x264";\r

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs
index f3b4bf096b435d3caa6a81b1635c5f9237720b6e..afdb831486b2240e626f97875c5e24f54097300a 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs
@@ -19,7 +19,7 @@ namespace HandBrake.Interop.Model.Encoding
                [Display(Name = "H.264 (x264)")]\r
                X264 = 0,\r
 \r
-        [Display(Name = "QuickSync (H.264)")]\r
+        [Display(Name = "H.264 (Intel QSV)")]\r
         QuickSync,\r
 \r
                [Display(Name = "MPEG-4 (FFmpeg)")]\r