X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_transition.c;h=afafc230aae2aa8fd5f591fbc6da044aa22cf910;hb=4db14da139d0cce1807d5f3530b271238786b795;hp=12443d7370e4a7cd1958fccb7d66b2d373af7478;hpb=6e4f3aabfeae526318998c1078213de269ea2e65;p=melted

diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index 12443d7..afafc23 100644
--- a/src/framework/mlt_transition.c
+++ b/src/framework/mlt_transition.c
@@ -72,7 +72,7 @@ mlt_transition mlt_transition_new( )
 
 mlt_service mlt_transition_service( mlt_transition this )
 {
-	return &this->parent;
+	return this != NULL ? &this->parent : NULL;
 }
 
 /** Get the properties interface.
@@ -197,6 +197,10 @@ 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 ( !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" ) )
+				mlt_properties_set_int( mlt_frame_properties( this->b_frame ), "test_audio", 1 );
 			this->a_held = 0;
 		}
 		else