commit c083500e41973256e0c3d4faf5948916b64e918e
author Danny Fernandes <dannyfernandes@google.com> Tue Feb 15 18:01:05 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 15 18:01:05 2011 -0800
tree e3cc8383f14d2504a77ad054d20d8227c124c365
parent a5589b915ccc72a57ce7be8831fc99ec80be424f
parent 0e248c82803c7880a15ce29c2d4be5c2189e414c

Merge "Fixed issue 3443078 overlay flicker on transition in exported video"

libvideoeditor/vss/mcs/src/M4MCS_API.c

diff --git a/libvideoeditor/vss/mcs/src/M4MCS_API.c b/libvideoeditor/vss/mcs/src/M4MCS_API.c
index d04befa..aaaed14 100755
--- a/libvideoeditor/vss/mcs/src/M4MCS_API.c
+++ b/libvideoeditor/vss/mcs/src/M4MCS_API.c
@@ -9410,7 +9410,7 @@
     * Check for end cut.
     * We must check here if the end cut is reached, because in that case we must
     * call the last encode step (-> bLastFrame set to true) */
-    if( ( pC->dViDecCurrentCts + pC->dCtsIncrement + 0.5) >= (pC->uiEndCutTime
+    if( ( pC->dViDecCurrentCts + pC->dCtsIncrement ) >= (pC->uiEndCutTime
         + M4MCS_ABS(pC->dViDecStartingCts - pC->uiBeginCutTime)) )
     {
         FrameMode =

libvideoeditor/vss/src/M4VSS3GPP_Clip.c

diff --git a/libvideoeditor/vss/src/M4VSS3GPP_Clip.c b/libvideoeditor/vss/src/M4VSS3GPP_Clip.c
index 0a3b737..b6408b3 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_Clip.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_Clip.c
@@ -686,7 +686,7 @@
         pClipCtxt->pSettings->uiEndCutTime = (M4OSA_UInt32)iDuration;
     }
 
-    pClipCtxt->iEndTime = pClipCtxt->pSettings->uiEndCutTime;
+    pClipCtxt->iEndTime = (M4OSA_Int32)pClipCtxt->pSettings->uiEndCutTime;
 
     /**
     * Return with no error */