[Mlt-devel] SF.net SVN: mlt: [1113] trunk/mlt/src/modules/core

[<dde...@us...>]

Revision: 1113
          http://mlt.svn.sourceforge.net/mlt/?rev=1113&view=rev
Author:   ddennedy
Date:     2008-04-22 23:29:46 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
filter_watermark.c, filter_composite.c: support explicit deinterlace of
composited image.

Modified Paths:
--------------
    trunk/mlt/src/modules/core/filter_watermark.c
    trunk/mlt/src/modules/core/transition_composite.c

Modified: trunk/mlt/src/modules/core/filter_watermark.c
===================================================================
--- trunk/mlt/src/modules/core/filter_watermark.c	2008-04-12 18:00:27 UTC (rev 1112)
+++ trunk/mlt/src/modules/core/filter_watermark.c	2008-04-23 06:29:46 UTC (rev 1113)
@@ -146,7 +146,7 @@
 			// 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 :-)

Modified: trunk/mlt/src/modules/core/transition_composite.c
===================================================================
--- trunk/mlt/src/modules/core/transition_composite.c	2008-04-12 18:00:27 UTC (rev 1112)
+++ trunk/mlt/src/modules/core/transition_composite.c	2008-04-23 06:29:46 UTC (rev 1113)
@@ -1037,7 +1037,7 @@
 
 		// 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" ) );
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.