From: Dan Dennedy <dan@dennedy.org>
Date: Mon, 28 Mar 2011 02:13:55 +0000 (-0700)
Subject: Fix composite using wrong B frame scaling.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f517ca454289d16fe429c12ef34776006396a33b;p=mlt

Fix composite using wrong B frame scaling.

This could happen when the caller of mlt_frame_get_image supplied 0 for
width and height. For example, Kdenlive's GL output with the sdl_audio
consumer with real_time > 1 and paused.
---

diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index 45683683..811ee8d3 100644
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -1120,8 +1120,8 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 
 		// Get the image from the b frame
 		uint8_t *image_b = NULL;
-		int width_b = *width;
-		int height_b = *height;
+		int width_b = *width > 0 ? *width : mlt_properties_get_int( a_props, "normalised_width" );
+		int height_b = *height > 0 ? *height : mlt_properties_get_int( a_props, "normalised_height" );
 	
 		// Vars for alphas
 		uint8_t *alpha_a = NULL;