summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/Converters
diff options
context:
space:
mode:
authorRodeo <[email protected]>2014-03-13 01:43:10 +0000
committerRodeo <[email protected]>2014-03-13 01:43:10 +0000
commitaf390e55e762996f367d4391ff72c8312f27e762 (patch)
tree5c79ca1f05f7023d9aa85e11f74febf56cf2bdaa /win/CS/HandBrakeWPF/Converters
parent042db50b62739c9a01ed83e225926dbe1de9b843 (diff)
WinGui: enable MP4 and Matroska muxing for x265.
Also, remove the raw muxer. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6106 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Converters')
-rw-r--r--win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs11
1 files changed, 0 insertions, 11 deletions
diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index 32b68e9fb..8e2f1d379 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -60,17 +60,6 @@ namespace HandBrakeWPF.Converters.Video
encoders.Remove(VideoEncoder.QuickSync);
}
- if (task != null && task.OutputFormat != OutputFormat.X265)
- {
- encoders.Remove(VideoEncoder.X265);
- }
-
- if (task != null && task.OutputFormat == OutputFormat.X265)
- {
- encoders.Clear();
- encoders.Add(VideoEncoder.X265);
- }
-
return EnumHelper<VideoEncoder>.GetEnumDisplayValuesSubset(encoders);
}