X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=fdad2cfec6e1fa140aebb428621ec05108baf045;hb=f5166fd9533abe00f46dc8742cc23ecae9fb19fb;hp=2bc482100c1e7e3565f38b4510e49920e30f0ba9;hpb=7651a182bf7191ab5db9b3741caeac2f86540281;p=melted

diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index 2bc4821..fdad2cf 100644
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -3,19 +3,19 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Dan Dennedy <dan@dennedy.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "transition_composite.h"
@@ -391,7 +391,7 @@ static void composite_line_yuv( uint8_t *dest, uint8_t *src, int width, uint8_t
 		dest++;
 		*dest = sample_mix( *dest, *src++, mix );
 		dest++;
-		*alpha_a = mix | *alpha_a;
+		*alpha_a = ( mix >> 8 ) | *alpha_a;
 		alpha_a ++;
 	}
 }
@@ -408,7 +408,7 @@ static void composite_line_yuv_or( uint8_t *dest, uint8_t *src, int width, uint8
 		dest++;
 		*dest = sample_mix( *dest, *src++, mix );
 		dest++;
-		*alpha_a ++ = mix;
+		*alpha_a ++ = mix >> 8;
 	}
 }
 
@@ -424,7 +424,7 @@ static void composite_line_yuv_and( uint8_t *dest, uint8_t *src, int width, uint
 		dest++;
 		*dest = sample_mix( *dest, *src++, mix );
 		dest++;
-		*alpha_a ++ = mix;
+		*alpha_a ++ = mix >> 8;
 	}
 }
 
@@ -440,7 +440,7 @@ static void composite_line_yuv_xor( uint8_t *dest, uint8_t *src, int width, uint
 		dest++;
 		*dest = sample_mix( *dest, *src++, mix );
 		dest++;
-		*alpha_a ++ = mix;
+		*alpha_a ++ = mix >> 8;
 	}
 }
 
@@ -747,7 +747,7 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
 		// ????: Shouln't this be the default behaviour?
 		if ( mlt_properties_get_int( properties, "fill" ) && scaled_width > 0 && scaled_height > 0 )
 		{
-			if ( scaled_height < normalised_height && scaled_width * normalised_height / scaled_height < normalised_width )
+			if ( scaled_height < normalised_height && scaled_width * normalised_height / scaled_height <= normalised_width )
 			{
 				scaled_width = rint( 0.5 + scaled_width * normalised_height / scaled_height );
 				scaled_height = normalised_height;