summaryrefslogtreecommitdiffstats
path: root/win/CS
diff options
context:
space:
mode:
Diffstat (limited to 'win/CS')
-rw-r--r--win/CS/Controls/x264Panel.Designer.cs12
-rw-r--r--win/CS/Controls/x264Panel.cs2
-rw-r--r--win/CS/Controls/x264Panel.resx6
3 files changed, 10 insertions, 10 deletions
diff --git a/win/CS/Controls/x264Panel.Designer.cs b/win/CS/Controls/x264Panel.Designer.cs
index e445c179b..538f3eff6 100644
--- a/win/CS/Controls/x264Panel.Designer.cs
+++ b/win/CS/Controls/x264Panel.Designer.cs
@@ -89,8 +89,8 @@ namespace Handbrake.Controls
this.slider_psytrellis.Size = new System.Drawing.Size(131, 45);
this.slider_psytrellis.TabIndex = 86;
this.ToolTip.SetToolTip(this.slider_psytrellis, "Psychovisual Trellis tries to retain more sharpness and detail, but can cause art" +
- "ifacting. \r\nIt is considered experimental, which is why it\'s off by default. Goo" +
- "d values are 0.1 to 0.2.");
+ "ifacting. \r\nIt is considered experimental, which is why it\'s off by default. Goo" +
+ "d values are 0.1 to 0.2.");
this.slider_psytrellis.Scroll += new System.EventHandler(this.widgetControlChanged);
//
// lbl_psytrellis
@@ -616,8 +616,8 @@ namespace Handbrake.Controls
this.slider_adaptiveQuantStrength.Size = new System.Drawing.Size(131, 45);
this.slider_adaptiveQuantStrength.TabIndex = 88;
this.ToolTip.SetToolTip(this.slider_adaptiveQuantStrength, "Adaptive quantization controls how the encoder distributes bits across the frame." +
- " \r\nHigher values take more bits away from edges and complex areas to improve ar" +
- "eas with finer detail");
+ " \r\nHigher values take more bits away from edges and complex areas to improve ar" +
+ "eas with finer detail");
this.slider_adaptiveQuantStrength.Value = 10;
this.slider_adaptiveQuantStrength.Scroll += new System.EventHandler(this.widgetControlChanged);
//
@@ -680,12 +680,12 @@ namespace Handbrake.Controls
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.BackColor = System.Drawing.Color.Transparent;
- this.Controls.Add(this.label3);
this.Controls.Add(this.rtf_x264Query);
+ this.Controls.Add(this.slider_psytrellis);
+ this.Controls.Add(this.label3);
this.Controls.Add(this.lbl_prymidalBframes);
this.Controls.Add(this.combo_pyrmidalBFrames);
this.Controls.Add(this.label1);
- this.Controls.Add(this.slider_psytrellis);
this.Controls.Add(this.slider_psyrd);
this.Controls.Add(this.lbl_adaptiveQuantStrength);
this.Controls.Add(this.slider_adaptiveQuantStrength);
diff --git a/win/CS/Controls/x264Panel.cs b/win/CS/Controls/x264Panel.cs
index 7678539f2..c511a70c4 100644
--- a/win/CS/Controls/x264Panel.cs
+++ b/win/CS/Controls/x264Panel.cs
@@ -577,7 +577,7 @@ namespace Handbrake.Controls
break;
case 2:
- thisOpt = "analyse=some";
+ thisOpt = "analyse=i4x4,i8x8";
break;
case 3:
diff --git a/win/CS/Controls/x264Panel.resx b/win/CS/Controls/x264Panel.resx
index 094e31ae0..41e3ec5c7 100644
--- a/win/CS/Controls/x264Panel.resx
+++ b/win/CS/Controls/x264Panel.resx
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="slider_psyrd.ToolTip" xml:space="preserve">