WinGui: Don't set -U or -P when QSV is enabled.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6090 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 8b246b58c5dc35c4a89a2f9f50cc741d14243245..a6567d3083fb0971482e35dd3564a75b08218769 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -143,7 +143,7 @@ namespace HandBrake.ApplicationServices.Utilities
             query += AdvancedQuery(task);\r
 \r
             // Extra Settings\r
-            query += ExtraSettings(verbosity, disableLibDvdNav, disableQsvDecode, enableHwd, enableOpenCL);\r
+            query += ExtraSettings(verbosity, disableLibDvdNav, disableQsvDecode, enableHwd, enableOpenCL, task.VideoEncoder == VideoEncoder.QuickSync);\r
 \r
             return query;\r
         }\r
@@ -1025,10 +1025,13 @@ namespace HandBrake.ApplicationServices.Utilities
         /// <param name="enableOpenCL">\r
         /// The enable Open CL.\r
         /// </param>\r
+        /// <param name="isQsv">\r
+        /// The is Qsv.\r
+        /// </param>\r
         /// <returns>\r
         /// A Cli Query as a string\r
         /// </returns>\r
-        private static string ExtraSettings(int verbosity, bool disableLibdvdNav, bool disableQsvDecode, bool enableHwd, bool enableOpenCL)\r
+        private static string ExtraSettings(int verbosity, bool disableLibdvdNav, bool disableQsvDecode, bool enableHwd, bool enableOpenCL, bool isQsv)\r
         {\r
             string query = string.Empty;\r
 \r
@@ -1042,11 +1045,13 @@ namespace HandBrake.ApplicationServices.Utilities
             if (disableQsvDecode)\r
                 query += " --disable-qsv-decoding";\r
 \r
-            if (enableOpenCL)\r
+            if (enableOpenCL && !isQsv)\r
                 query += " -P ";\r
 \r
-            if (enableHwd)\r
+            if (enableHwd && !isQsv)\r
+            {\r
                 query += " -U ";\r
+            }\r
 \r
             return query;\r
         }\r