X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_transition.c;h=bdd106aab592e49ff0d5e84ad32e98f525423628;hb=b6232c93db568b3becc00019ca18e31bd92e54b5;hp=61c38bef9802544aa4a4c6b5203bfcdd8d363006;hpb=c95736fd9ee742f5e6db06bbe579f23895f55eba;p=melted

diff --git a/src/modules/core/filter_transition.c b/src/modules/core/filter_transition.c
index 61c38be..bdd106a 100644
--- a/src/modules/core/filter_transition.c
+++ b/src/modules/core/filter_transition.c
@@ -30,7 +30,8 @@
 static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
 	mlt_transition transition = mlt_frame_pop_service( this );
-	mlt_transition_process( transition, this, this );
+	if ( mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "image_count" ) >= 1 )
+		mlt_transition_process( transition, this, this );
 	return mlt_frame_get_image( this, image, format, width, height, writable );
 }
 
@@ -75,12 +76,12 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 		// Refresh with current user values
 		mlt_properties_pass( MLT_TRANSITION_PROPERTIES( transition ), MLT_FILTER_PROPERTIES( this ), "transition." );
 
-		if ( type & 1 )
+		if ( type & 1 && !mlt_frame_is_test_card( frame ) && !( mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "hide" ) & 1 ) )
 		{
 			mlt_frame_push_service( frame, transition );
 			mlt_frame_push_get_image( frame, filter_get_image );
 		}
-		if ( type & 2 )
+		if ( type & 2 && !mlt_frame_is_test_audio( frame ) && !( mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "hide" ) & 2 ) )
 		{
 			mlt_frame_push_audio( frame, transition );
 			mlt_frame_push_audio( frame, filter_get_audio );