]> git.sesse.net Git - mlt/commitdiff
Fix crash in composite-on-composite (kdenlive-1315).
authorDan Dennedy <dan@dennedy.org>
Tue, 8 Dec 2009 06:04:41 +0000 (22:04 -0800)
committerDan Dennedy <dan@dennedy.org>
Tue, 8 Dec 2009 06:04:41 +0000 (22:04 -0800)
src/modules/core/transition_composite.c

index a88c1d6a309c65502f196a776272043918617c9e..12b07103e1903da99ea2e8c8cbfc512a38561611 100644 (file)
@@ -859,6 +859,11 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
 
        ret = mlt_frame_get_image( b_frame, image, &format, width, height, 1 );
 
+       // composite_yuv uses geometry->sw to determine source stride, which
+       // should equal the image width if not using crop property.
+       if ( !mlt_properties_get( properties, "crop" ) )
+               geometry->sw = *width;
+
        // Set the frame back
        mlt_properties_set_int( b_props, "resize_alpha", resize_alpha );