OpenCL: Merging Trunk to OpenCL branch in preparation to merge back to core after the upcoming release ships.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/opencl@5418 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 2 insertions, 2 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index e22345134..2a11914b8 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -33,7 +33,7 @@ namespace HandBrake.ApplicationServices.Utilities
         /// The preset.

         /// </param>

         /// <param name="build">

-        /// The build.

+        /// The build.PictureModulusPictureModulus

         /// </param>

         public static void Export(string path, Preset preset, string build)

         {

@@ -268,7 +268,7 @@ namespace HandBrake.ApplicationServices.Utilities
             AddEncodeElement(xmlWriter, "VideoAvgBitrate", "string", parsed.VideoBitrate.ToString());

             AddEncodeElement(xmlWriter, "VideoEncoder", "string", EnumHelper<VideoEncoder>.GetDisplay(parsed.VideoEncoder));

             AddEncodeElement(xmlWriter, "VideoFramerate", "string", parsed.Framerate == null ? "Same as source" : parsed.Framerate.ToString());

-            AddEncodeElement(xmlWriter, "VideFrameratePFR", "integer", parsed.FramerateMode == FramerateMode.PFR ? "1" : "0");

+            AddEncodeElement(xmlWriter, "VideoFramerateMode", "string", parsed.FramerateMode.ToString().ToLower());

             AddEncodeElement(xmlWriter, "VideoGrayScale", "integer", parsed.Grayscale ? "1" : "0");

             AddEncodeElement(xmlWriter, "VideoQualitySlider", "real", parsed.Quality.ToString());

             AddEncodeElement(xmlWriter, "h264Level", "string", parsed.H264Level);