# HG changeset patch
# User tomwalters@google.com
# Date 1335915144 0
# Node ID 167d8ec2468e988c8c431490a2aa90e84ff0881e
# Parent  3dff17554c6d9e8aa57b0075e72d57629f61efdc
Fixed ffmpeg frame-rate bug

diff -r 3dff17554c6d -r 167d8ec2468e trunk/src/Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovie.cc
--- a/trunk/src/Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovie.cc	Mon Apr 23 22:58:40 2012 +0000
+++ b/trunk/src/Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovie.cc	Tue May 01 23:32:24 2012 +0000
@@ -166,9 +166,9 @@
   float frame_rate = global_parameters_->DefaultFloat("frame_rate", -1.0);
   char sCmdLine[1024]; //!\todo check that snprintf does not want a larger buffer
   snprintf(sCmdLine, sizeof(sCmdLine)/sizeof(sCmdLine[0]),
-    "%s -y -i \"%s\" -i \"%s%%06d.png\" "
+    "%s -y -i \"%s\" -r %.2f -i \"%s%%06d.png\" "
     "-sameq -r %.2f -ar 44100 -acodec pcm_s16le %s \"%s\"",
-    sffmpegPath, sound_filename_.c_str(), directory_.c_str(),
+    sffmpegPath, sound_filename_.c_str(), frame_rate, directory_.c_str(),
     frame_rate, sCodecOptions, movie_filename_.c_str());
     printf(sCmdLine);
     printf("\n");