X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=aece92b9a91582983b8fc680571e8d24e1746f87;hb=95f2d83a2093a4761f0075971a85a65139be51a6;hp=d6c27e3c146b7bdd16b0f3b106ebf926ea086944;hpb=d611d9a6dac62501464e2b9c3d7ab6299ce072fe;p=melted diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c index d6c27e3..aece92b 100644 --- a/src/framework/mlt_producer.c +++ b/src/framework/mlt_producer.c @@ -89,11 +89,15 @@ int mlt_producer_init( mlt_producer this, void *child ) if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) ) { mlt_properties_set_double( properties, "fps", 25.0 ); + mlt_properties_set_int( properties, "frame_rate_num", 25 ); + mlt_properties_set_int( properties, "frame_rate_den", 1 ); mlt_properties_set_double( properties, "aspect_ratio", 59.0 / 54.0 ); } else { mlt_properties_set_double( properties, "fps", 30000.0 / 1001.0 ); + mlt_properties_set_int( properties, "frame_rate_num", 30000 ); + mlt_properties_set_int( properties, "frame_rate_den", 1001 ); mlt_properties_set_double( properties, "aspect_ratio", 10.0 / 11.0 ); } mlt_properties_set_double( properties, "_speed", 1.0 ); @@ -201,6 +205,7 @@ mlt_producer mlt_producer_cut( mlt_producer this, int in, int out ) mlt_properties_set_int( properties, "_cut", 1 ); mlt_properties_set_data( properties, "_cut_parent", parent, 0, ( mlt_destructor )mlt_producer_close, NULL ); mlt_properties_set_position( properties, "length", mlt_properties_get_position( parent_props, "length" ) ); + mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( parent_props, "aspect_ratio" ) ); mlt_producer_set_in_and_out( result, in, out ); // Mini fezzik :-/ @@ -248,14 +253,14 @@ int mlt_producer_seek( mlt_producer this, mlt_position position ) { position = 0; } - else if ( use_points && !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) ) + else if ( use_points && ( eof == NULL || !strcmp( eof, "pause" ) ) && position >= mlt_producer_get_playtime( this ) ) { mlt_producer_set_speed( this, 0 ); position = mlt_producer_get_playtime( this ) - 1; } else if ( use_points && !strcmp( eof, "loop" ) && position >= mlt_producer_get_playtime( this ) ) { - position = position % mlt_producer_get_playtime( this ); + position = (int)position % (int)mlt_producer_get_playtime( this ); } // Set the position