]> granicus.if.org Git - handbrake/commitdiff
[0.10.x] Don't show x264 query in the extra options tooltip for x265.
authorsr55 <sr55.hb@outlook.com>
Sat, 27 Jun 2015 19:01:03 +0000 (19:01 +0000)
committersr55 <sr55.hb@outlook.com>
Sat, 27 Jun 2015 19:01:03 +0000 (19:01 +0000)
git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.10.x@7321 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs

index ccb5cd73a14724aaaff1283824af3565246779cb..2f09580a3c356ee4aa58e453202eb179a3e47a24 100644 (file)
@@ -915,7 +915,14 @@ namespace HandBrakeWPF.ViewModels
         {\r
             get\r
             {\r
-                return string.Format(Resources.Video_EncoderExtraArgs, this.GetActualx264Query()); // "You can provide additional arguments using the standard x264 format"; \r
+                if (this.SelectedVideoEncoder == VideoEncoder.X264)\r
+                {\r
+                    return string.Format(Resources.Video_EncoderExtraArgs, this.GetActualx264Query()); // "You can provide additional arguments using the standard x264 format"; \r
+                }\r
+                else\r
+                {\r
+                    return "Pass additional parameters to the encoder.";\r
+                }\r
             }\r
         }\r
 \r
@@ -1343,6 +1350,7 @@ namespace HandBrakeWPF.ViewModels
             {\r
                 tunes.Add(this.X264Tune.ToString().ToLower().Replace(" ", string.Empty)); // TODO tidy this sillyness up.\r
             }\r
+\r
             if (this.FastDecode)\r
             {\r
                 tunes.Add("fastdecode");\r