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 3ea3ec0316eb4603e4268205ab9a5c2311934872..f3695d2b775ae3cb2567ef6fae684df9e444fc0d 100644 (file)
--- 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