quick valerie fix

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

diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index ed7de2e..f0032c1 100644 (file)
--- 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 uint32_t smoothstep( int32_t edge1, int32_t edge2, uint32_t a )
+static inline int32_t smoothstep( int32_t edge1, int32_t edge2, uint32_t a )
 {
        if ( a < edge1 )
                return 0;
@@ -152,10 +152,9 @@ static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width
 
        int32_t i_softness = softness * ( 1 << 16 );
 
-       int field_count = field_order <= 0 ? 1 : 2;
+       int field_count = field_order < 0 ? 1 : 2;
        int field_stride_src = field_count * stride_src;
        int field_stride_dest = field_count * stride_dest;
-
        int field = 0;
 
        // composite using luma map
@@ -163,7 +162,7 @@ static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width
        {
                p_row = p_src + field * stride_src;
                q_row = p_dest + field * stride_dest;
-               y_offset = ( field * luma_width ) << 16;
+               y_offset = field << 16;
                i = field;
 
                while ( i < height_src )
@@ -438,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" );