diff --git a/.version b/.version index 7062f8a3..f2db4abd 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.2.9.1-alpha \ No newline at end of file +1.2.9.2-alpha \ No newline at end of file diff --git a/source/Axiom/Axiom/Filters.cs b/source/Axiom/Axiom/Filters.cs index 9559e4ed..3c4f50d5 100644 --- a/source/Axiom/Axiom/Filters.cs +++ b/source/Axiom/Axiom/Filters.cs @@ -694,16 +694,18 @@ public static String VideoFilter(MainWindow mainwindow) // -------------------------------------------------- // Add Each Filter to Master Filters List // -------------------------------------------------- - // ------------------------- - // Resize - // ------------------------- - Video.Size(mainwindow); // ------------------------- // Crop // ------------------------- Video.Crop(mainwindow, Video.cropwindow); + // ------------------------- + // Resize + // ------------------------- + Video.Size(mainwindow); + + // ------------------------- // PNG to JPEG // ------------------------- diff --git a/source/Axiom/Axiom/Properties/AssemblyInfo.cs b/source/Axiom/Axiom/Properties/AssemblyInfo.cs index dfbe25b6..207d38f4 100644 --- a/source/Axiom/Axiom/Properties/AssemblyInfo.cs +++ b/source/Axiom/Axiom/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.9.1")] -[assembly: AssemblyFileVersion("1.2.9.1")] +[assembly: AssemblyVersion("1.2.9.2")] +[assembly: AssemblyFileVersion("1.2.9.2")] diff --git a/source/Axiom/Axiom/VideoControls.cs b/source/Axiom/Axiom/VideoControls.cs index b8d73316..c996fd8f 100644 --- a/source/Axiom/Axiom/VideoControls.cs +++ b/source/Axiom/Axiom/VideoControls.cs @@ -2202,6 +2202,11 @@ public static void PixelFormat(MainWindow mainwindow) { mainwindow.cboPixelFormat.SelectedItem = "yuv444p"; } + // Auto + else if ((string)mainwindow.cboVideoQuality.SelectedItem == "Auto") + { + mainwindow.cboPixelFormat.SelectedItem = "auto"; + } // All Other Quality else { @@ -2220,7 +2225,7 @@ public static void PixelFormat(MainWindow mainwindow) // Lossless can't be yuv444p // All Pixel Formats yuv420p - mainwindow.cboPixelFormat.SelectedItem = "yuv420p"; + mainwindow.cboPixelFormat.SelectedItem = "yuv420p"; } // ------------------------- @@ -2253,6 +2258,11 @@ public static void PixelFormat(MainWindow mainwindow) { mainwindow.cboPixelFormat.SelectedItem = "bgra"; } + // Auto + else if ((string)mainwindow.cboVideoQuality.SelectedItem == "Auto") + { + mainwindow.cboPixelFormat.SelectedItem = "auto"; + } // All Other Quality else { @@ -2277,6 +2287,14 @@ public static void PixelFormat(MainWindow mainwindow) mainwindow.cboPixelFormat.IsEnabled = false; mainwindow.cboPixelFormat.SelectedItem = "auto"; } + + //// ------------------------- + //// Auto + //// ------------------------- + //if ((string)mainwindow.cboVideoQuality.SelectedItem == "Auto") + //{ + // mainwindow.cboPixelFormat.SelectedItem = "auto"; + //} } // ------------------------- @@ -2287,14 +2305,6 @@ public static void PixelFormat(MainWindow mainwindow) mainwindow.cboPixelFormat.SelectedItem = "auto"; mainwindow.cboPixelFormat.IsEnabled = false; } - - // ------------------------- - // Auto - // ------------------------- - if ((string)mainwindow.cboVideoQuality.SelectedItem == "Auto") - { - mainwindow.cboPixelFormat.SelectedItem = "auto"; - } }