summaryrefslogtreecommitdiffstats
path: root/win/CS
diff options
context:
space:
mode:
authorsr55 <[email protected]>2015-06-27 19:01:03 +0000
committersr55 <[email protected]>2015-06-27 19:01:03 +0000
commitda4f2f21d162f540570f139c2b2b60f10c258a65 (patch)
tree58bba7e4be4d22370c7c96236d34b8e58c73adf3 /win/CS
parentbca2e7087c826315390ccbed37b3a4f107432923 (diff)
[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
Diffstat (limited to 'win/CS')
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs10
1 files changed, 9 insertions, 1 deletions
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");