X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_service.c;h=d120d28e3c58c4f47fb33677df0c1593e66c628d;hb=eccf04749681f70957f34fdd6742224774e72d15;hp=46197804ae0bc4f355740ff2d5f99d3f5f1409e4;hpb=fab74b3d7391168c82a3b0408288a3ae82242ff4;p=melted

diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
index 4619780..d120d28 100644
--- a/src/framework/mlt_service.c
+++ b/src/framework/mlt_service.c
@@ -338,7 +338,8 @@ void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index )
 			{
 				mlt_position in = mlt_filter_get_in( base->filters[ i ] );
 				mlt_position out = mlt_filter_get_out( base->filters[ i ] );
-				if ( ( in == 0 && out == 0 ) || ( position >= in && ( position <= out || out == 0 ) ) )
+				int disable = mlt_properties_get_int( MLT_FILTER_PROPERTIES( base->filters[ i ] ), "disable" );
+				if ( !disable && ( ( in == 0 && out == 0 ) || ( position >= in && ( position <= out || out == 0 ) ) ) )
 				{
 					mlt_properties_set_position( frame_properties, "in", in == 0 ? this_in : in );
 					mlt_properties_set_position( frame_properties, "out", out == 0 ? this_out : out );
@@ -355,17 +356,26 @@ void mlt_service_apply_filters( mlt_service this, mlt_frame frame, int index )
 
 int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
 {
+	int result = 0;
+
+	// Lock the service
 	mlt_service_lock( this );
+
+	// Ensure that the frame is NULL
+	*frame = NULL;
+
+	// Only process if we have a valid service
 	if ( this != NULL && this->get_frame != NULL )
 	{
-		int result = 0;
 		mlt_properties properties = MLT_SERVICE_PROPERTIES( this );
 		mlt_position in = mlt_properties_get_position( properties, "in" );
 		mlt_position out = mlt_properties_get_position( properties, "out" );
-		mlt_properties_inc_ref( properties );
+
 		result = this->get_frame( this, frame, index );
+
 		if ( result == 0 )
 		{
+			mlt_properties_inc_ref( properties );
 			properties = MLT_FRAME_PROPERTIES( *frame );
 			if ( in >=0 && out > 0 )
 			{
@@ -374,18 +384,17 @@ int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index )
 			}
 			mlt_service_apply_filters( this, *frame, 1 );
 			mlt_deque_push_back( MLT_FRAME_SERVICE_STACK( *frame ), this );
-			mlt_service_unlock( this );
 		}
-		else
-		{
-			mlt_service_unlock( this );
-			mlt_service_close( this );
-		}
-		return result;
 	}
+
+	// Make sure we return a frame
+	if ( *frame == NULL )
+		*frame = mlt_frame_init( );
+
+	// Unlock the service
 	mlt_service_unlock( this );
-	*frame = mlt_frame_init( );
-	return 0;
+
+	return result;
 }
 
 static void mlt_service_filter_changed( mlt_service owner, mlt_service this )