diff options
| author | sr55 <[email protected]> | 2012-12-29 19:11:29 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-12-29 19:11:29 +0000 |
| commit | 403d4abe29055f9d910d10ed28509a684805f835 (patch) | |
| tree | d5e11acdce5a72932f7e808410a0f5fa73b5fcec /win/CS/HandBrake.Interop | |
| parent | ab39134445f79f1684a3d8ab814085e04ade27d7 (diff) | |
Merging trunk to opencl branch.
git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/opencl@5116 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.Interop')
3 files changed, 1 insertions, 7 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Preset.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Preset.cs index d0bb915a4..f68c293e5 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Preset.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Preset.cs @@ -16,9 +16,6 @@ namespace HandBrake.Interop.Model.Encoding.x264 /// </summary>
public enum x264Preset
{
- [Display(Name = "None")]
- None = 0,
-
[Display(Name = "Ultrafast")]
Ultrafast,
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Profile.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Profile.cs index 9cbce6161..e82d772d6 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Profile.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Profile.cs @@ -16,7 +16,7 @@ namespace HandBrake.Interop.Model.Encoding.x264 /// </summary>
public enum x264Profile
{
- [Display(Name = "None")]
+ [Display(Name = "Auto")]
None = 0,
[Display(Name = "Baseline")]
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Tune.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Tune.cs index 60421cc02..1ae23c437 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Tune.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Tune.cs @@ -39,8 +39,5 @@ namespace HandBrake.Interop.Model.Encoding.x264 [Display(Name = "Fast Decode")]
Fastdecode,
-
- [Display(Name = "Zero Latency")]
- Zerolatency,
}
}
|