WinGui: Enable the x265 raw muxer for testing. Note to everyone playing with this...

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6063 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs
index 7e30009b7329157701ebb4c93937818886236482..d9faaa6a4bd699ff3aa17b3962129ac28820d2dd 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs
@@ -38,7 +38,7 @@ namespace HandBrake.Interop.Model.Encoding
                Theora,\r
 \r
         [Display(Name = "H.265 (x265)")]\r
-        [ShortName("hvec")]\r
+        [ShortName("x265")]\r
         X265\r
        }\r
 }\r

diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index 6854656d44cca22afd50ff98f23488562cdef687..32b68e9fbae780c95054218a400d4dbb3db30b84 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -65,6 +65,12 @@ namespace HandBrakeWPF.Converters.Video
                     encoders.Remove(VideoEncoder.X265);\r
                 }\r
 \r
+                if (task != null && task.OutputFormat == OutputFormat.X265)\r
+                {\r
+                    encoders.Clear();\r
+                    encoders.Add(VideoEncoder.X265);\r
+                }\r
+\r
                 return EnumHelper<VideoEncoder>.GetEnumDisplayValuesSubset(encoders);\r
             }\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 4306fc7f7a8dbda57273482e22397b242a95117e..fb657e686384ac166ab96ea4b5b00735dcca2c04 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -615,7 +615,7 @@ namespace HandBrakeWPF.ViewModels
             {\r
                 return new List<OutputFormat>\r
                     {\r
-                         OutputFormat.Mp4, OutputFormat.Mkv\r
+                         OutputFormat.Mp4, OutputFormat.Mkv, OutputFormat.X265\r
                     };\r
             }\r
         }\r