WinGui: Some issues with loading ffmpeg4 encoder via presets fixed.

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

diff --git a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
index c47e7c5efe8863b8d9ed54fa710cc5229458ae21..830c074e91d8a2ce5187110bbfb2df8a476a3cee 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
@@ -293,7 +293,9 @@ namespace HandBrake.ApplicationServices.Functions
         {\r
             switch (encoder)\r
             {\r
+                case "":\r
                 case "ffmpeg":\r
+                case "ffmpeg4":\r
                     return VideoEncoder.FFMpeg;\r
                 case "ffmpeg2":\r
                     return VideoEncoder.FFMpeg2;\r
@@ -320,7 +322,7 @@ namespace HandBrake.ApplicationServices.Functions
             switch (encoder)\r
             {\r
                 case VideoEncoder.FFMpeg:\r
-                    return "ffmpeg";\r
+                    return "ffmpeg4";\r
                 case VideoEncoder.FFMpeg2:\r
                     return "ffmpeg2";\r
                 case VideoEncoder.X264:\r

diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index 6e8f97fcceaa847158e8168be7c2af9eae9c31a7..a8780aa85ff5379955c989d489f5ccfa1b804b7b 100644 (file)
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -1243,8 +1243,8 @@ namespace Handbrake
             }\r
 \r
             // Add the job.\r
-\r
-            this.queueProcessor.QueueManager.Add(QueryGenerator.GenerateFullQuery(this));\r
+            QueueTask query = QueryGenerator.GenerateFullQuery(this);\r
+            this.queueProcessor.QueueManager.Add(query);\r
 \r
             lbl_encode.Text = this.queueProcessor.QueueManager.Count + " encode(s) pending in the queue";\r
 \r