diff options
| author | sr55 <[email protected]> | 2013-08-23 22:01:06 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2013-08-23 22:01:06 +0000 |
| commit | 229d0c1badf2be70981bf2e1d5bbeac60f49bb2f (patch) | |
| tree | 312b47d35754d7109414108c01585b3af212d6e7 /win/CS/HandBrakeWPF | |
| parent | c7dc884bbee9c87fb4e7eb974d5ee029f4c234e4 (diff) | |
WinGui: Implement hb_qsv_available in the UI so that the encoder isn't shown when the build hasn't been built with quicksync support or the system doesn't support it.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5742 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF')
| -rw-r--r-- | win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs index 412d53416..dc78ad1ca 100644 --- a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="x264QueueTooltipConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="EncoderOptionsTooltipConverter.cs" company="HandBrake Project (http://handbrake.fr)">
// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
// </copyright>
// <summary>
diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs index 6ec2dc964..e9fa3d7a4 100644 --- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs @@ -50,11 +50,16 @@ namespace HandBrakeWPF.Converters.Video List<VideoEncoder> encoders = EnumHelper<VideoEncoder>.GetEnumList().ToList();
EncodeTask task = values[1] as EncodeTask;
- if (task != null && task.OutputFormat != OutputFormat.Mkv)
+ if (task != null && (task.OutputFormat != OutputFormat.Mkv || task.OutputFormat != OutputFormat.av_mkv))
{
encoders.Remove(VideoEncoder.Theora);
}
+ if (!SystemInfo.IsQsvAvailable)
+ {
+ encoders.Remove(VideoEncoder.QuickSync);
+ }
+
return EnumHelper<VideoEncoder>.GetEnumDisplayValuesSubset(encoders);
}
|