X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=fdad2cfec6e1fa140aebb428621ec05108baf045;hb=6faffae447b342b5e0c9424c5e0b9207a0fae4df;hp=f4d8663a55e151d3472c3caeed035eb52d2ede2d;hpb=64ae2085596a63af531253297fe915e7dbd17c88;p=melted diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index f4d8663..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 * - * 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" @@ -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;