From: ddennedy Date: Mon, 29 Mar 2004 23:48:04 +0000 (+0000) Subject: bugfix limits in transition luma X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=f4fef6a77643c2ec85e00f0afc28d88fe0fbd4a9;p=melted bugfix limits in transition luma git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@260 d19143bc-622f-0410-bfdd-b5b2a6649095 --- diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c index 609b610..0243974 100644 --- a/src/modules/core/transition_luma.c +++ b/src/modules/core/transition_luma.c @@ -78,6 +78,10 @@ static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, in mlt_frame_get_image( this, &p_dest, &format, &width, &height, 1 ); mlt_frame_get_image( that, &p_src, &format, &width_src, &height_src, 0 ); + // Pick the lesser of two evils ;-) + width_src = width_src > width ? width : width_src; + height_src = height_src > height ? height : height_src; + p = p_dest; limit = p_dest + height_src * width_src * 2; @@ -128,6 +132,10 @@ static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width mlt_frame_get_image( a_frame, &p_dest, &format_dest, &width_dest, &height_dest, 1 ); mlt_frame_get_image( b_frame, &p_src, &format_src, &width_src, &height_src, 0 ); + // Pick the lesser of two evils ;-) + width_src = width_src > width_dest ? width_dest : width_src; + height_src = height_src > height_dest ? height_dest : height_src; + stride_src = width_src * 2; stride_dest = width_dest * 2; diff --git a/src/modules/gtk2/filter_rescale.c b/src/modules/gtk2/filter_rescale.c index 936e0e6..92b2b7b 100644 --- a/src/modules/gtk2/filter_rescale.c +++ b/src/modules/gtk2/filter_rescale.c @@ -74,7 +74,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * { // When no scaling is requested, revert the requested dimensions if possible mlt_properties_set_int( properties, "rescale_width", ( iwidth / 2 ) * 2 ); - mlt_properties_set_int( properties, "rescale_height", ( iheight /2 ) * 2 ); + mlt_properties_set_int( properties, "rescale_height", ( iheight / 2 ) * 2 ); } // Get the image as requested