westley/libxml2 mods, mcdv/mpeg release integration

[melted] / src / framework / mlt_frame.c

diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index 86920c8..b576aeb 100644 (file)
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -53,7 +53,7 @@ mlt_frame mlt_frame_init( )
                mlt_properties_init( properties, this );
 
                // Set default properties on the frame
-               mlt_properties_set_position( properties, "position", 0.0 );
+               mlt_properties_set_position( properties, "_position", 0.0 );
                mlt_properties_set_data( properties, "image", NULL, 0, NULL, NULL );
                mlt_properties_set_int( properties, "width", 720 );
                mlt_properties_set_int( properties, "height", 576 );
@@ -109,7 +109,7 @@ int mlt_frame_set_aspect_ratio( mlt_frame this, double value )
 
 mlt_position mlt_frame_get_position( mlt_frame this )
 {
-       return mlt_properties_get_position( mlt_frame_properties( this ), "position" );
+       return mlt_properties_get_position( mlt_frame_properties( this ), "_position" );
 }
 
 /** Set the position of this frame.
@@ -117,7 +117,7 @@ mlt_position mlt_frame_get_position( mlt_frame this )
 
 int mlt_frame_set_position( mlt_frame this, mlt_position value )
 {
-       return mlt_properties_set_position( mlt_frame_properties( this ), "position", value );
+       return mlt_properties_set_position( mlt_frame_properties( this ), "_position", value );
 }
 
 /** Stack a get_image callback.
@@ -721,9 +721,9 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t *
        double d = 0, s = 0;
 
        mlt_frame_get_audio( this, &p_dest, format, &frequency_dest, &channels_dest, &samples_dest );
-       fprintf( stderr, "frame dest samples %d channels %d position %lld\n", samples_dest, channels_dest, mlt_properties_get_position( mlt_frame_properties( this ), "position" ) );
+       //fprintf( stderr, "frame dest samples %d channels %d position %lld\n", samples_dest, channels_dest, mlt_properties_get_position( mlt_frame_properties( this ), "_position" ) );
        mlt_frame_get_audio( that, &p_src, format, &frequency_src, &channels_src, &samples_src );
-       fprintf( stderr, "frame src  samples %d channels %d\n", samples_src, channels_src );
+       //fprintf( stderr, "frame src  samples %d channels %d\n", samples_src, channels_src );
        src = p_src;
        dest = p_dest;
        if ( channels_src > 6 )