X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_transition.c;fp=src%2Fframework%2Fmlt_transition.c;h=7606ab18dab08d3f0f2d7bd086c7008d3d873b0b;hb=77a1a6728272d122e878834539761ac574f6c1da;hp=1d2d3c3a84c6c90acaf37630b6579084c5f59f58;hpb=00a5d9f88928966dc7b522b02bd791aa44a51238;p=melted

diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index 1d2d3c3..7606ab1 100644
--- a/src/framework/mlt_transition.c
+++ b/src/framework/mlt_transition.c
@@ -182,6 +182,7 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
 	int b_track = mlt_properties_get_int( properties, "b_track" );
 	mlt_position in = mlt_properties_get_position( properties, "in" );
 	mlt_position out = mlt_properties_get_position( properties, "out" );
+	int always_active = mlt_properties_get_int( properties, "always_active" );
 
 	if ( ( index == a_track || index == b_track ) && !( this->a_held || this->b_held ) )
 	{
@@ -196,7 +197,7 @@ static int transition_get_frame( mlt_service service, mlt_frame_ptr frame, int i
 	{
 		// Determine if we're in the right time zone
 		mlt_position position = mlt_frame_get_position( this->a_frame );
-		if ( position >= in && position <= out )
+		if ( always_active || ( position >= in && position <= out ) )
 		{
 			if ( !accepts_blanks && ( this->b_frame == NULL || ( mlt_frame_is_test_card( this->b_frame ) && mlt_frame_is_test_audio( this->b_frame ) ) ) )
 			{