From: lilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Sat, 25 Sep 2004 07:25:49 +0000 (+0000)
Subject: Transitions ignore test frames
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=c3ed1af8d2f360901ec37c4f5862fd9d60a0ddcd;p=melted

Transitions ignore test frames


git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@444 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index 1395775..5996e14 100644
--- a/src/framework/mlt_transition.c
+++ b/src/framework/mlt_transition.c
@@ -150,8 +150,10 @@ mlt_position mlt_transition_get_out( mlt_transition this )
 
 mlt_frame mlt_transition_process( mlt_transition this, mlt_frame a_frame, mlt_frame b_frame )
 {
-	if ( this->process == NULL )
+	if ( this->process == NULL || b_frame == NULL || ( mlt_frame_is_test_card( b_frame ) && mlt_frame_is_test_audio( b_frame ) ) )
 		return a_frame;
+	else if ( a_frame == NULL || ( mlt_frame_is_test_card( a_frame ) && mlt_frame_is_test_audio( a_frame ) ) )
+		return b_frame;
 	else
 		return this->process( this, a_frame, b_frame );
 }
@@ -199,6 +201,12 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
 		{
 			// Process the transition
 			*frame = mlt_transition_process( this, this->a_frame, this->b_frame );
+			if ( *frame == this->b_frame )
+			{
+				mlt_frame t = this->a_frame;
+				this->a_frame = this->b_frame;
+				this->b_frame = t;
+			}
 			if ( !mlt_properties_get_int( mlt_frame_properties( this->a_frame ), "test_image" ) )
 				mlt_properties_set_int( mlt_frame_properties( this->b_frame ), "test_image", 1 );
 			if ( !mlt_properties_get_int( mlt_frame_properties( this->a_frame ), "test_audio" ) )