X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Ffilter_avdeinterlace.c;h=b071f6efa072f3f965485310216f70593c006ba2;hb=78cb03b80c9483db3f3c6bb44eb420da69ca60c0;hp=919d1e4f2bb22208b1ec7ef58e09905e387a4ddd;hpb=e48990e98a385144481adfb64405e2a9d07de3a2;p=melted

diff --git a/src/modules/avformat/filter_avdeinterlace.c b/src/modules/avformat/filter_avdeinterlace.c
index 919d1e4..b071f6e 100644
--- a/src/modules/avformat/filter_avdeinterlace.c
+++ b/src/modules/avformat/filter_avdeinterlace.c
@@ -294,14 +294,17 @@ static int mlt_avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
 static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
 	int error = 0;
-	
+	int deinterlace = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "consumer_deinterlace" );
+
+	// Determine if we need a writable version or not
+	if ( deinterlace && !writable )
+		 writable = !mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "progressive" );
+
 	// Get the input image
-	error = mlt_frame_get_image( this, image, format, width, height, 1 );
+	error = mlt_frame_get_image( this, image, format, width, height, writable );
 
 	// Check that we want progressive and we aren't already progressive
-	if ( *format == mlt_image_yuv422 && *image != NULL &&
-		 !mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "progressive" ) &&
-		 mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "consumer_deinterlace" ) )
+	if ( deinterlace && *format == mlt_image_yuv422 && *image != NULL && !mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "progressive" ) )
 	{
 		// Create a picture
 		AVPicture *output = mlt_pool_alloc( sizeof( AVPicture ) );