rc/framework/mlt_frame.c

[melted] / src / framework / mlt_producer.c

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index 1b86f6c..f137973 100644 (file)
--- 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 :-/
@@ -244,7 +249,7 @@ int mlt_producer_seek( mlt_producer this, mlt_position position )
                mlt_producer_seek( mlt_producer_cut_parent( this ), position + mlt_producer_get_in( this ) );
 
        // Check bounds
-       if ( position < 0 )
+       if ( position < 0 || mlt_producer_get_playtime( this ) == 0 )
        {
                position = 0;
        }
@@ -528,6 +533,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 ) );
                }
        }