diff options
| author | Danny Fernandes <dannyfernandes@google.com> | 2011-02-15 18:01:05 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-15 18:01:05 -0800 |
| commit | c083500e41973256e0c3d4faf5948916b64e918e (patch) | |
| tree | e3cc8383f14d2504a77ad054d20d8227c124c365 | |
| parent | a5589b915ccc72a57ce7be8831fc99ec80be424f (diff) | |
| parent | 0e248c82803c7880a15ce29c2d4be5c2189e414c (diff) | |
| download | frameworks_av-c083500e41973256e0c3d4faf5948916b64e918e.zip frameworks_av-c083500e41973256e0c3d4faf5948916b64e918e.tar.gz frameworks_av-c083500e41973256e0c3d4faf5948916b64e918e.tar.bz2 | |
Merge "Fixed issue 3443078 overlay flicker on transition in exported video"
| -rwxr-xr-x | libvideoeditor/vss/mcs/src/M4MCS_API.c | 2 | ||||
| -rwxr-xr-x | libvideoeditor/vss/src/M4VSS3GPP_Clip.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ static M4OSA_ERR M4MCS_intVideoTranscoding( M4MCS_InternalContext *pC ) * 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 = 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 @@ M4OSA_ERR M4VSS3GPP_intClipOpen( M4VSS3GPP_ClipContext *pClipCtxt, pClipCtxt->pSettings->uiEndCutTime = (M4OSA_UInt32)iDuration; } - pClipCtxt->iEndTime = pClipCtxt->pSettings->uiEndCutTime; + pClipCtxt->iEndTime = (M4OSA_Int32)pClipCtxt->pSettings->uiEndCutTime; /** * Return with no error */ |