Fix build errors caused by the (hypothetical) conversion of mlt_position from an...

preserving original behavior.

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@799 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index cbc680e..e97202e 100644 (file)
--- a/src/inigo/inigo.c
+++ b/src/inigo/inigo.c
@@ -66,7 +66,7 @@ static void transport_action( mlt_producer producer, char *value )
                                                if ( time == last )
                                                        break;
                                                last = time;
-                                               fprintf( stderr, "%d: %d\n", i, time );
+                                               fprintf( stderr, "%d: %d\n", i, (int)time );
                                        }
                                }
                                break;
@@ -180,7 +180,7 @@ static void transport( mlt_producer producer, mlt_consumer consumer )
                                transport_action( producer, ( char * )&value );
 
                        if ( !silent && mlt_properties_get_int( properties, "stats_off" ) == 0 )
-                               fprintf( stderr, "Current Position: %10d\r", mlt_producer_position( producer ) );
+                               fprintf( stderr, "Current Position: %10d\r", (int)mlt_producer_position( producer ) );
 
                        if ( silent )
                                nanosleep( &tm, NULL );

diff --git a/src/modules/core/filter_luma.c b/src/modules/core/filter_luma.c
index 22165af..00c11ae 100644 (file)
--- a/src/modules/core/filter_luma.c
+++ b/src/modules/core/filter_luma.c
@@ -66,7 +66,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 
        if ( luma != NULL && 
                ( mlt_properties_get( properties, "blur" ) != NULL || 
-                 mlt_frame_get_position( this ) % ( out + 1 ) != out ) )
+                 (int)mlt_frame_get_position( this ) % ( out + 1 ) != out ) )
        {
                mlt_properties luma_properties = MLT_TRANSITION_PROPERTIES( luma );
                mlt_properties_pass( luma_properties, properties, "luma." );

diff --git a/src/modules/motion_est/filter_crop_detect.c b/src/modules/motion_est/filter_crop_detect.c
index ef9f48f..b47e307 100644 (file)
--- a/src/modules/motion_est/filter_crop_detect.c
+++ b/src/modules/motion_est/filter_crop_detect.c
@@ -75,7 +75,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
        }
 
        // For periodic detection (with offset of 'skip')
-       if( frequency == 0 || (mlt_frame_get_position(this)+skip) % frequency != 0)
+       if( frequency == 0 || (int)mlt_frame_get_position(this)+skip % frequency  != 0)
        {
 
                // Inject in stream 

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 577d205..4bc6660 100644 (file)
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -593,10 +593,10 @@ static void *video_thread( void *arg )
                if ( mlt_properties_get_int( properties, "rendered" ) == 1 && this->running )
                {
                        // Obtain the scheduled playout time
-                       mlt_position scheduled = mlt_properties_get_position( properties, "playtime" );
+                       int64_t scheduled = mlt_properties_get_int( properties, "playtime" );
 
                        // Determine the difference between the elapsed time and the scheduled playout time
-                       mlt_position difference = scheduled - elapsed;
+                       int64_t difference = scheduled - elapsed;
 
                        // Smooth playback a bit
                        if ( real_time && ( difference > 20000 && speed == 1.0 ) )
@@ -714,7 +714,7 @@ static void *consumer_thread( void *arg )
                        }
 
                        // Set playtime for this frame
-                       mlt_properties_set_position( properties, "playtime", playtime );
+                       mlt_properties_set_int( properties, "playtime", playtime );
 
                        while ( this->running && mlt_deque_count( this->queue ) > 15 )
                                nanosleep( &tm, NULL );