X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=861edff8b8fb0ceee2918026a0cc4f580dfe3723;hb=bc6274668d39c754532465f95c5c317718180251;hp=979e39c9d59c574d1cc64e68edecb7a6c8eed1e0;hpb=2216e73bda74f15e98e1d5667d518b14f0df8823;p=melted

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 979e39c..861edff 100644
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -206,8 +206,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
 	mlt_properties_set_int( frame_properties, "width", mlt_properties_get_int( properties, "width" ) );
 	mlt_properties_set_int( frame_properties, "height", mlt_properties_get_int( properties, "height" ) );
 	mlt_properties_set( frame_properties, "rescale.interp", mlt_properties_get( properties, "rescale.interp" ) );
-	if ( mlt_properties_get_int( properties, "distort" ) )
-		mlt_properties_set_int( frame_properties, "distort", mlt_properties_get_int( properties, "distort" ) );
+	mlt_properties_set_int( frame_properties, "distort", mlt_properties_get_int( properties, "distort" ) );
 	mlt_properties_set_double( frame_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "consumer_aspect_ratio" ) );
 	mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_double( properties, "consumer_deinterlace" ) );
 	mlt_properties_set_int( frame_properties, "normalised_width", mlt_properties_get_double( properties, "normalised_width" ) );
@@ -218,8 +217,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
 	mlt_properties_set_int( properties, "height", *height );
 	mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( frame ) );
 	mlt_properties_set_int( properties, "progressive", mlt_properties_get_int( frame_properties, "progressive" ) );
-	if ( mlt_properties_get_int( frame_properties, "distort" ) )
-		mlt_properties_set_int( properties, "distort", mlt_properties_get_int( frame_properties, "distort" ) );
+	mlt_properties_set_int( properties, "distort", mlt_properties_get_int( frame_properties, "distort" ) );
 	data = mlt_frame_get_alpha_mask( frame );
 	mlt_properties_set_data( properties, "alpha", data, 0, NULL, NULL );
 	return 0;
@@ -321,11 +319,18 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 					{
 						// Move the contents of this queue on to the output frames data queue
 						mlt_deque sub_queue = mlt_properties_get_data( MLT_FRAME_PROPERTIES( temp ), "data_queue", NULL );
+						mlt_deque temp = mlt_deque_init( );
 						while ( mlt_deque_count( sub_queue ) )
 						{
-							void *p = mlt_deque_pop_back( sub_queue );
-							mlt_deque_push_back( data_queue, p );
+							mlt_properties p = mlt_deque_pop_back( sub_queue );
+							if ( mlt_properties_get_int( p, "frame_lock" ) == 0 )
+								mlt_deque_push_back( data_queue, p );
+							else
+								mlt_deque_push_back( temp, p );
 						}
+						while( mlt_deque_count( temp ) )
+							mlt_deque_push_front( sub_queue, mlt_deque_pop_back( temp ) );
+						mlt_deque_close( temp );
 					}
 				}