From: lilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Thu, 26 Feb 2004 19:17:46 +0000 (+0000)
Subject: composite alignment fix
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=6a21c03c32e7ecbb3df1410f92c9d7e5f44903e5;p=melted

composite alignment fix


git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@172 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index 3ea3ec0..f3695d2 100644
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -153,8 +153,6 @@ static void geometry_calculate( struct geometry_s *output, struct geometry_s *in
 	output->w = in->w + ( out->w - in->w ) * position;
 	output->h = in->h + ( out->h - in->h ) * position;
 	output->mix = in->mix + ( out->mix - in->mix ) * position;
-	output->sw = output->w;
-	output->sh = output->h;
 	output->distort = in->distort;
 }
 
@@ -454,6 +452,10 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
 	mlt_properties b_props = mlt_frame_properties( b_frame );
 	mlt_properties properties = mlt_transition_properties( this );
 
+	// ???: Not getting the logic of this...
+	geometry->sw = geometry->w;
+	geometry->sh = geometry->h;
+
 	if ( mlt_properties_get( properties, "distort" ) == NULL && geometry->distort == 0 )
 	{
 		// Adjust b_frame pixel aspect