X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_transition.c;h=047a9e94fb921a6b0ac08cd938a57984e322486d;hb=256a13009f23bb17ffa337373f48520258e1dda4;hp=0f1fceb33fc53842732a9d6fa626371c0fcd52be;hpb=da46016cc4e9c751ab346b9b8f451a59cd276b03;p=melted

diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index 0f1fceb..047a9e9 100644
--- a/src/framework/mlt_transition.c
+++ b/src/framework/mlt_transition.c
@@ -3,19 +3,19 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * 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 "config.h"
@@ -275,18 +275,20 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
 			mlt_frame b_frame_ptr = this->frames[ !reverse_order ? b_frame : a_frame ];
 			int a_hide = mlt_properties_get_int( MLT_FRAME_PROPERTIES( a_frame_ptr ), "hide" );
 			int b_hide = mlt_properties_get_int( MLT_FRAME_PROPERTIES( b_frame_ptr ), "hide" );
-
-			// Process the transition
-			*frame = mlt_transition_process( this, a_frame_ptr, b_frame_ptr );
-
-			// We need to ensure that the tractor doesn't consider this frame for output
-			if ( *frame == a_frame_ptr )
-				b_hide |= type;
-			else
-				a_hide |= type;
-
-			mlt_properties_set_int( MLT_FRAME_PROPERTIES( a_frame_ptr ), "hide", a_hide );
-			mlt_properties_set_int( MLT_FRAME_PROPERTIES( b_frame_ptr ), "hide", b_hide );
+			if ( !( a_hide & type ) && !( b_hide & type ) )
+			{
+				// Process the transition
+				*frame = mlt_transition_process( this, a_frame_ptr, b_frame_ptr );
+	
+				// We need to ensure that the tractor doesn't consider this frame for output
+				if ( *frame == a_frame_ptr )
+					b_hide |= type;
+				else
+					a_hide |= type;
+	
+				mlt_properties_set_int( MLT_FRAME_PROPERTIES( a_frame_ptr ), "hide", a_hide );
+				mlt_properties_set_int( MLT_FRAME_PROPERTIES( b_frame_ptr ), "hide", b_hide );
+			}
 		}
 	}