X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=b8bd2c601b10b3adf65c84f1ab883c9dc1fabaf1;hb=91fb4d73caa09a606c46393c7565462bf926e6a8;hp=55f85ada23c7d1c04ba040b1b033c661f480a71b;hpb=da46016cc4e9c751ab346b9b8f451a59cd276b03;p=melted diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c index 55f85ad..b8bd2c6 100644 --- a/src/framework/mlt_producer.c +++ b/src/framework/mlt_producer.c @@ -194,8 +194,8 @@ mlt_producer mlt_producer_cut( mlt_producer this, int in, int out ) // Special case - allow for a cut of the entire producer (this will squeeze all other cuts to 0) if ( in <= 0 ) in = 0; - if ( ( out < 0 || out >= mlt_producer_get_playtime( parent ) ) && !mlt_producer_is_blank( this ) ) - out = mlt_producer_get_playtime( parent ) - 1; + if ( ( out < 0 || out >= mlt_producer_get_length( parent ) ) && !mlt_producer_is_blank( this ) ) + out = mlt_producer_get_length( parent ) - 1; mlt_properties_inc_ref( parent_props ); mlt_properties_set_int( properties, "_cut", 1 ); @@ -528,6 +528,8 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind char *name = mlt_properties_get_name( p_props, i ); if ( !strncmp( name, "meta.", 5 ) ) mlt_properties_set( f_props, name, mlt_properties_get( p_props, name ) ); + else if ( !strncmp( name, "set.", 4 ) ) + mlt_properties_set( f_props, name + 4, mlt_properties_get( p_props, name ) ); } }