From 3a3de3e87d74c3354eb00883e981349210d08d67 Mon Sep 17 00:00:00 2001
From: Roman <romanl@google.com>
Date: Mon, 3 Oct 2016 11:51:24 -0400
Subject: [PATCH] GUACAMOLE-110: Fix guacenc framerate rounding affecting video
 length

---
 src/guacenc/video.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/guacenc/video.c b/src/guacenc/video.c
index e0624a24..874dd16c 100644
--- a/src/guacenc/video.c
+++ b/src/guacenc/video.c
@@ -209,6 +209,8 @@ static int guacenc_video_flush_frame(guacenc_video* video) {
 int guacenc_video_advance_timeline(guacenc_video* video,
         guac_timestamp timestamp) {
 
+    guac_timestamp next_timestamp = timestamp;
+
     /* Flush frames as necessary if previously updated */
     if (video->last_timestamp != 0) {
 
@@ -220,6 +222,10 @@ int guacenc_video_advance_timeline(guacenc_video* video,
         if (elapsed == 0)
             return 0;
 
+        /* Use frame time as last_timestamp */
+        next_timestamp = video->last_timestamp
+                        + elapsed * 1000 / GUACENC_VIDEO_FRAMERATE;
+
         /* Flush frames to bring timeline in sync, duplicating if necessary */
         do {
             guacenc_video_flush_frame(video);
@@ -228,7 +234,7 @@ int guacenc_video_advance_timeline(guacenc_video* video,
     }
 
     /* Update timestamp */
-    video->last_timestamp = timestamp;
+    video->last_timestamp = next_timestamp;
     return 0;
 
 }