3 files changed, 13 insertions, 1 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 1bcbbbae1..5770105f6 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -920,6 +920,15 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Additional advanced arguments that can be passed to the video encoder..
+        /// </summary>
+        public static string Video_EncoderExtraArgsTooltip {
+            get {
+                return ResourceManager.GetString("Video_EncoderExtraArgsTooltip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Sets and ensures compliance with the specified H.264 Levels. This will override all other settings..
         /// </summary>
         public static string Video_EncoderLevel {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index aa554ffa9..b21a76e81 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -549,4 +549,7 @@ Presets from older versions must be re-created in the current version.</value>
 
 Please use the 'Extra Options' box on the 'Video' tab to input any additional encoder parameters you may need.</value>
   </data>
+  <data name="Video_EncoderExtraArgsTooltip" xml:space="preserve">
+    <value>Additional advanced arguments that can be passed to the video encoder.</value>
+  </data>
 </root>
 \ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index 3378bbfa3..423dbd42b 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -793,7 +793,7 @@ namespace HandBrakeWPF.ViewModels
         {
             get
             {
-                return string.Format(Resources.Video_EncoderExtraArgs, this.GetActualx264Query()); // "You can provide additional arguments using the standard x264 format"; 
+                return this.SelectedVideoEncoder != VideoEncoder.X264 ? Resources.Video_EncoderExtraArgsTooltip : string.Format(Resources.Video_EncoderExtraArgs, this.GetActualx264Query());
             }
         }