Fix affine on non-square pixels (kdenlive-1880).

diff --git a/src/modules/plus/transition_affine.c b/src/modules/plus/transition_affine.c
index ebdded79fe9ccd4d7577dda0235f07511fa1e80b..11c38b15822625c2e936e8a558004c763377e16b 100644 (file)
--- a/src/modules/plus/transition_affine.c
+++ b/src/modules/plus/transition_affine.c
@@ -470,22 +470,22 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                if ( mlt_properties_get_int( properties, "distort" ) )
                {
                        scale_x = geom_scale_x * ( scale_x == 0 ? 1 : scale_x );
-                       scale_y = geom_scale_y / consumer_ar * ( scale_y == 0 ? 1 : scale_y );
+                       scale_y = geom_scale_y * ( scale_y == 0 ? 1 : scale_y );
                }
                else
                {
                        // Determine scale with respect to aspect ratio.
                        double consumer_dar = consumer_ar * normalised_width / normalised_height;
                        double b_dar = mlt_properties_get_double( b_props, "aspect_ratio" ) * b_width / b_height;
-
+                       
                        if ( b_dar > consumer_dar )
                        {
                                scale_x = geom_scale_x * ( scale_x == 0 ? 1 : scale_x );
-                               scale_y = geom_scale_x / consumer_ar * ( scale_y == 0 ? 1 : scale_y );
+                               scale_y = geom_scale_x * ( scale_y == 0 ? 1 : scale_y );
                        }
                        else
                        {
-                               scale_x = geom_scale_y * consumer_ar * ( scale_x == 0 ? 1 : scale_x );
+                               scale_x = geom_scale_y * ( scale_x == 0 ? 1 : scale_x );
                                scale_y = geom_scale_y * ( scale_y == 0 ? 1 : scale_y );
                        }
                }