From da4f2f21d162f540570f139c2b2b60f10c258a65 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 27 Jun 2015 19:01:03 +0000 Subject: [0.10.x] Don't show x264 query in the extra options tooltip for x265. git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.10.x@7321 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'win/CS') diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs index ccb5cd73a..2f09580a3 100644 --- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs @@ -915,7 +915,14 @@ namespace HandBrakeWPF.ViewModels { get { - return string.Format(Resources.Video_EncoderExtraArgs, this.GetActualx264Query()); // "You can provide additional arguments using the standard x264 format"; + if (this.SelectedVideoEncoder == VideoEncoder.X264) + { + return string.Format(Resources.Video_EncoderExtraArgs, this.GetActualx264Query()); // "You can provide additional arguments using the standard x264 format"; + } + else + { + return "Pass additional parameters to the encoder."; + } } } @@ -1343,6 +1350,7 @@ namespace HandBrakeWPF.ViewModels { tunes.Add(this.X264Tune.ToString().ToLower().Replace(" ", string.Empty)); // TODO tidy this sillyness up. } + if (this.FastDecode) { tunes.Add("fastdecode"); -- cgit v1.2.3