2 files changed, 34 insertions, 21 deletions
diff --git a/win/CS/Controls/Filters.Designer.cs b/win/CS/Controls/Filters.Designer.cs
index 63223a8db..6b415f3b9 100644
--- a/win/CS/Controls/Filters.Designer.cs
+++ b/win/CS/Controls/Filters.Designer.cs
@@ -52,8 +52,8 @@
             // 
             // text_customDT
             // 
-            this.text_customDT.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.text_customDT.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.text_customDT.Location = new System.Drawing.Point(251, 3);
             this.text_customDT.Name = "text_customDT";
             this.text_customDT.Size = new System.Drawing.Size(115, 21);
@@ -74,8 +74,8 @@
             // 
             // drop_detelecine
             // 
-            this.drop_detelecine.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.drop_detelecine.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.drop_detelecine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.drop_detelecine.FormattingEnabled = true;
             this.drop_detelecine.Items.AddRange(new object[] {
@@ -90,8 +90,8 @@
             // 
             // text_customDC
             // 
-            this.text_customDC.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.text_customDC.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.text_customDC.Location = new System.Drawing.Point(251, 30);
             this.text_customDC.Name = "text_customDC";
             this.text_customDC.Size = new System.Drawing.Size(115, 21);
@@ -112,15 +112,16 @@
             // 
             // drop_decomb
             // 
-            this.drop_decomb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.drop_decomb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.drop_decomb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.drop_decomb.FormattingEnabled = true;
             this.drop_decomb.Items.AddRange(new object[] {
             "Off",
             "Custom",
             "Default",
-            "Fast"});
+            "Fast",
+            "Bob"});
             this.drop_decomb.Location = new System.Drawing.Point(71, 30);
             this.drop_decomb.Name = "drop_decomb";
             this.drop_decomb.Size = new System.Drawing.Size(174, 21);
@@ -129,8 +130,8 @@
             // 
             // text_customDI
             // 
-            this.text_customDI.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.text_customDI.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.text_customDI.Location = new System.Drawing.Point(251, 57);
             this.text_customDI.Name = "text_customDI";
             this.text_customDI.Size = new System.Drawing.Size(115, 21);
@@ -151,8 +152,8 @@
             // 
             // drop_deinterlace
             // 
-            this.drop_deinterlace.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.drop_deinterlace.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.drop_deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.drop_deinterlace.FormattingEnabled = true;
             this.drop_deinterlace.Items.AddRange(new object[] {
@@ -160,7 +161,8 @@
             "Custom",
             "Fast",
             "Slow",
-            "Slower"});
+            "Slower",
+            "Bob"});
             this.drop_deinterlace.Location = new System.Drawing.Point(71, 57);
             this.drop_deinterlace.Name = "drop_deinterlace";
             this.drop_deinterlace.Size = new System.Drawing.Size(174, 21);
@@ -169,8 +171,8 @@
             // 
             // text_customDN
             // 
-            this.text_customDN.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.text_customDN.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.text_customDN.Location = new System.Drawing.Point(251, 84);
             this.text_customDN.Name = "text_customDN";
             this.text_customDN.Size = new System.Drawing.Size(115, 21);
@@ -191,8 +193,8 @@
             // 
             // drop_denoise
             // 
-            this.drop_denoise.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.drop_denoise.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.drop_denoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.drop_denoise.FormattingEnabled = true;
             this.drop_denoise.Items.AddRange(new object[] {
@@ -209,8 +211,8 @@
             // 
             // slider_deblock
             // 
-            this.slider_deblock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.slider_deblock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.slider_deblock.BackColor = System.Drawing.SystemColors.Window;
             this.slider_deblock.Location = new System.Drawing.Point(71, 111);
             this.slider_deblock.Maximum = 15;
diff --git a/win/CS/Controls/Filters.cs b/win/CS/Controls/Filters.cs
index b091b65ff..32d7d7b3e 100644
--- a/win/CS/Controls/Filters.cs
+++ b/win/CS/Controls/Filters.cs
@@ -188,6 +188,9 @@ namespace Handbrake.Controls
                     case "Fast":
                         query += " --decomb=\"7:2:6:9:1:80\"";
                         break;
+                    case "Bob":
+                        query += " --decomb=\"bob\"";
+                        break;
                     default:
                         query += string.Empty;
                         break;
@@ -210,6 +213,9 @@ namespace Handbrake.Controls
                     case "Custom":
                         query += " --deinterlace=\"" + text_customDI.Text + "\"";
                         break;
+                    case "Bob":
+                        query += " --deinterlace=\"bob\"";
+                        break;
                     default:
                         query += string.Empty;
                         break;
@@ -337,7 +343,9 @@ namespace Handbrake.Controls
                     break;
                 case Deinterlace.Slower:
                     drop_deinterlace.SelectedIndex = 4;
-
+                    break;
+                case Deinterlace.Bob:
+                    drop_deinterlace.SelectedIndex = 5;
                     break;
                 default:
                     drop_deinterlace.SelectedIndex = 1;
@@ -371,6 +379,9 @@ namespace Handbrake.Controls
                 case Decomb.Fast:
                     drop_decomb.SelectedIndex = 3;
                     break;
+                case Decomb.Bob:
+                    drop_decomb.SelectedIndex = 4;
+                    break;
                 default:
                     drop_decomb.SelectedIndex = 1;
                     text_customDC.Text = custom;