From: lilo_booter Date: Mon, 31 Jan 2005 14:14:42 +0000 (+0000) Subject: Small correction to deinterlacing X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=087a35e2a051b00b8cb007e57c9657794cea123a;p=melted Small correction to deinterlacing git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@634 d19143bc-622f-0410-bfdd-b5b2a6649095 --- diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c index 99ca151..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