]> git.sesse.net Git - mlt/commitdiff
Fix force_progressive=0 on avformat producer.
authorDan Dennedy <dan@dennedy.org>
Wed, 3 Feb 2010 06:49:17 +0000 (22:49 -0800)
committerDan Dennedy <dan@dennedy.org>
Fri, 5 Feb 2010 04:46:53 +0000 (20:46 -0800)
src/modules/avformat/producer_avformat.c

index 950ee1c5b81f559f0ab02d1881c0a3c890580436..6c95914d5804569115646277d638597e72e158fc 100644 (file)
@@ -1222,8 +1222,10 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 
 exit_get_image:
        // Set the progressive flag
-       mlt_properties_set_int( frame_properties, "progressive", 
-               !this->av_frame->interlaced_frame || !!mlt_properties_get_int( properties, "force_progressive" ) );
+       if ( mlt_properties_get( properties, "force_progressive" ) )
+               mlt_properties_set_int( frame_properties, "progressive", !!mlt_properties_get_int( properties, "force_progressive" ) );
+       else
+               mlt_properties_set_int( frame_properties, "progressive", !this->av_frame->interlaced_frame );
 
        // Set the field order property for this frame
        mlt_properties_set_int( frame_properties, "top_field_first", this->top_field_first );