X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=bcc65ac13d81b54cd823166cae075b0f55270767;hb=087a35e2a051b00b8cb007e57c9657794cea123a;hp=29f248eed10825bf6de7dfab9871cac731f3ed1e;hpb=431b31b728b23fe9b35bf79a5d165876d581e6b8;p=melted

diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
index 29f248e..bcc65ac 100644
--- a/src/framework/mlt_consumer.c
+++ b/src/framework/mlt_consumer.c
@@ -293,8 +293,7 @@ mlt_frame mlt_consumer_get_frame( mlt_consumer this )
 
 		// Aspect ratio and other jiggery pokery
 		mlt_properties_set_double( frame_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
-		if ( mlt_properties_get_int( properties, "progressive" ) || mlt_properties_get_int( properties, "deinterlace" ) )
-			mlt_properties_set_int( frame_properties, "consumer_deinterlace", 1 );
+		mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" ) );
 	}
 
 	// Return the frame
@@ -366,7 +365,6 @@ static void *consumer_read_ahead_thread( void *arg )
 	{
 		samples = mlt_sample_calculator( fps, frequency, counter++ );
 		mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples );
-		frame->get_audio = NULL;
 	}
 
 	mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "rendered", 1 );
@@ -439,7 +437,6 @@ static void *consumer_read_ahead_thread( void *arg )
 		{
 			samples = mlt_sample_calculator( fps, frequency, counter++ );
 			mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples );
-			frame->get_audio = NULL;
 		}
 
 		// Increment the time take for this frame