X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_transition.c;h=047a9e94fb921a6b0ac08cd938a57984e322486d;hb=90d959b0ae338fb5a50cd6a94f61bbc7106aab70;hp=18e747dd0c2d7a7f8802aaff7df832d5fdeb6f89;hpb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;p=melted

diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index 18e747d..047a9e9 100644
--- a/src/framework/mlt_transition.c
+++ b/src/framework/mlt_transition.c
@@ -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 );
+			}
 		}
 	}