summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Decomb.cs3
-rw-r--r--win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs2
-rw-r--r--win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs8
3 files changed, 7 insertions, 6 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Decomb.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Decomb.cs
index 3bbd33093..a2b544029 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Decomb.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Decomb.cs
@@ -19,9 +19,6 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding
[ShortName("default")]
Default,
- [ShortName("fast")]
- Fast,
-
[ShortName("bob")]
Bob,
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
index 71af5cc0d..6ea377bc6 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
@@ -92,6 +92,8 @@ namespace HandBrakeWPF.Services.Encode.Model
this.CustomDeinterlace = task.CustomDeinterlace;
this.CustomDenoise = task.CustomDenoise;
this.CustomDetelecine = task.CustomDetelecine;
+ this.CustomCombDetect = task.CustomCombDetect;
+ this.CombDetect = task.CombDetect;
this.Deblock = task.Deblock;
this.Decomb = task.Decomb;
this.Deinterlace = task.Deinterlace;
diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index 046e51d5b..8b323d396 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -13,7 +13,6 @@ namespace HandBrakeWPF.Services.Presets.Factories
using System.Collections.ObjectModel;
using System.Globalization;
using System.Linq;
- using System.Windows.Forms.VisualStyles;
using HandBrake.ApplicationServices.Interop.Json.Presets;
using HandBrake.ApplicationServices.Interop.Model;
@@ -132,8 +131,11 @@ namespace HandBrakeWPF.Services.Presets.Factories
case "bob":
preset.Task.Decomb = Decomb.Bob;
break;
- case "fast":
- preset.Task.Decomb = Decomb.Fast;
+ case "eedi2":
+ preset.Task.Decomb = Decomb.EEDI2;
+ break;
+ case "eedi2bob":
+ preset.Task.Decomb = Decomb.EEDI2Bob;
break;
default:
preset.Task.Decomb = Decomb.Default;