From: ddennedy Date: Sun, 1 Jun 2008 21:32:16 +0000 (+0000) Subject: filter_watermark.c: bugfix propogation of output_ratio as a double - was causing... X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=028f5d69b24940626983b5ffa63c9fb77cf8ce86;p=melted filter_watermark.c: bugfix propogation of output_ratio as a double - was causing incorrect calculations in transition_composite.c with non-square-pixel watermark sources. git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1131 d19143bc-622f-0410-bfdd-b5b2a6649095 --- diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c index 8136958..dd3e0af 100644 --- a/src/modules/core/filter_watermark.c +++ b/src/modules/core/filter_watermark.c @@ -147,7 +147,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format 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_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" ) ); + mlt_properties_set_double( b_props, "output_ratio", mlt_properties_get_double( a_props, "output_ratio" ) ); // Check for the special case - no aspect ratio means no problem :-) if ( mlt_frame_get_aspect_ratio( b_frame ) == 0 )