filter_watermark.c, filter_composite.c: support explicit deinterlace of

composited image.

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1113 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c
index ce1b0f170ad57244013ddad68410f3cc1a42888a..8136958c8388613d1ea7a5fd65803dcba511a64a 100644 (file)
--- a/src/modules/core/filter_watermark.c
+++ b/src/modules/core/filter_watermark.c
@@ -146,7 +146,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                        // Set the b frame to be in the same position and have same consumer requirements
                        mlt_frame_set_position( b_frame, position );
                        mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
-                       mlt_properties_set_int( b_props, "consumer_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) );
+                       mlt_properties_set_int( b_props, "consumer_deinterlace", mlt_properties_get_int( a_props, "consumer_deinterlace" ) || mlt_properties_get_int( properties, "deinterlace" ) );
                        mlt_properties_set_int( b_props, "output_ratio", mlt_properties_get_double( a_props, "output_ratio" ) );
 
                        // Check for the special case - no aspect ratio means no problem :-)

diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index 20f0a4f2a0091c1fdd1a4f21674b9640e4f187c8..9104073b9f52ce3092b3b3029c9112e01dc390b9 100644 (file)
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -1037,7 +1037,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 
                // Since we are the consumer of the b_frame, we must pass along these
                // consumer properties from the a_frame
-               mlt_properties_set_double( b_props, "consumer_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) );
+               mlt_properties_set_int( b_props, "consumer_deinterlace", mlt_properties_get_int( a_props, "consumer_deinterlace" ) || mlt_properties_get_int( properties, "deinterlace" ) );
                mlt_properties_set( b_props, "consumer_deinterlace_method", mlt_properties_get( a_props, "consumer_deinterlace_method" ) );
                mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );