commit 49f000409c48afd40366baef2e8fc8ea838b782f
author James Dong <jdong@google.com> Thu Feb 09 23:54:07 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 09 23:54:07 2012 -0800
tree 4771122734e5028cdf139a2c455e3cc65eb067a2
parent ff65330bfdd2841110d8ff2a1aba3543b2cb3156
parent c4689fae1bdb8d1c94eb28af1b2a1f30d2b1a3da

Merge "Move away from MediaDebug and use ADebug instead"

libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c

diff --git a/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c b/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
index ee69fd3..59d57e5 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
@@ -1182,8 +1182,6 @@
         * Render Clip1 */
         if( pC->pC1->isRenderDup == M4OSA_FALSE )
         {
-            pC->bIssecondClip = M4OSA_FALSE;
-
             err = M4VSS3GPP_intRenderFrameWithEffect(pC, pC->pC1, ts, M4OSA_TRUE,
                                                 pTempPlaneClip1, pTemp1,
                                                 pPlaneOut);
@@ -3594,9 +3592,11 @@
         }
 
         if (bIsClip1 == M4OSA_TRUE) {
+            pC->bIssecondClip = M4OSA_FALSE;
             numEffects = pC->nbActiveEffects;
         } else {
             numEffects = pC->nbActiveEffects1;
+            pC->bIssecondClip = M4OSA_TRUE;
         }
 
         if ( numEffects > 0) {