X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_luma.c;h=f0032c131d647d74df92dff16cfd552bec7039c2;hb=bea649aa7c6f4f4c57b67678be7dfe74d4db66b3;hp=bba678d8f8413465bebd9ea830bc5d4b69d7ca38;hpb=598f7732f9affad93b6556ddf185ff6b9d295643;p=melted

diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index bba678d..f0032c1 100644
--- a/src/modules/core/transition_luma.c
+++ b/src/modules/core/transition_luma.c
@@ -92,7 +92,7 @@ static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, in
 
 // image processing functions
 
-static inline int32_t smoothstep( int32_t edge1, int32_t edge2, int32_t a )
+static inline int32_t smoothstep( int32_t edge1, int32_t edge2, uint32_t a )
 {
 	if ( a < edge1 )
 		return 0;
@@ -437,8 +437,9 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 	float frame_delta = delta_calculate( transition, a_frame );
 	
 	float luma_softness = mlt_properties_get_double( properties, "softness" );
-	int progressive = mlt_properties_get_int( b_props, "progressive" ) ||
+	int progressive = mlt_properties_get_int( a_props, "progressive" ) ||
 			mlt_properties_get_int( a_props, "consumer_progressive" ) ||
+			mlt_properties_get_int( properties, "progressive" ) ||
 			mlt_properties_get_int( b_props, "luma.progressive" );
 	int top_field_first =  mlt_properties_get_int( b_props, "top_field_first" );
 	int reverse = mlt_properties_get_int( properties, "reverse" );