From 541315b44fd4328385c2d8099d7212a1db06c050 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Mon, 18 Jul 2005 09:03:41 +0000 Subject: [PATCH] + Inherits deinterlace method from the consumer + Sanity check on scaled size for compositing git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@765 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/core/transition_composite.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index df24e61f..5fb0eb38 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -751,7 +751,7 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t ** // Honour the fill request - this will scale the image to fill width or height while maintaining a/r // ????: Shouln't this be the default behaviour? - if ( mlt_properties_get_int( properties, "fill" ) ) + if ( mlt_properties_get_int( properties, "fill" ) && scaled_width > 0 && scaled_height > 0 ) { if ( scaled_height < normalised_height && scaled_width * normalised_height / scaled_height < normalised_width ) { @@ -1028,6 +1028,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f // Since we are the consumer of the b_frame, we must pass along these // consumer properties from the a_frame mlt_properties_set_double( b_props, "consumer_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) ); + mlt_properties_set( b_props, "consumer_deinterlace_method", mlt_properties_get( a_props, "consumer_deinterlace_method" ) ); mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) ); // TODO: Dangerous/temporary optimisation - if nothing to do, then do nothing -- 2.39.2