Splits, joins and repeats

[melted] / src / modules / core / transition_luma.c

diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index 0243974..f5da57e 100644 (file)
--- a/src/modules/core/transition_luma.c
+++ b/src/modules/core/transition_luma.c
@@ -452,6 +452,9 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
        int top_field_first =  mlt_properties_get_int( b_props, "top_field_first" );
        int reverse = mlt_properties_get_int( properties, "reverse" );
 
+       if ( mlt_properties_get( a_props, "rescale.interp" ) == NULL )
+               mlt_properties_set( a_props, "rescale.interp", "nearest" );
+
        // Since we are the consumer of the b_frame, we must pass along this
        // consumer property from the a_frame
        if ( !strcmp( mlt_properties_get( a_props, "rescale.interp" ), "none" ) )
@@ -469,6 +472,9 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
        // Ensure we get scaling on the b_frame
        mlt_properties_set( b_props, "rescale.interp", "nearest" );
 
+       if ( mlt_properties_get( properties, "fixed" ) )
+               mix = mlt_properties_get_double( properties, "fixed" );
+
        if ( luma_width > 0 && luma_height > 0 && luma_bitmap != NULL )
                // Composite the frames using a luma map
                luma_composite( a_frame, b_frame, luma_width, luma_height, luma_bitmap, mix, frame_delta,