Merge ../mlt

[melted] / src / framework / mlt_property.c

diff --git a/src/framework/mlt_property.c b/src/framework/mlt_property.c
index e09c019..7cbb681 100644 (file)
--- a/src/framework/mlt_property.c
+++ b/src/framework/mlt_property.c
@@ -264,7 +264,7 @@ static inline int mlt_property_atoi( const char *value )
        if ( value == NULL )
                return 0;
        // Parse a hex color value as #RRGGBB or #AARRGGBB.
-       else if ( value[0] == '#' )
+       if ( value[0] == '#' )
        {
                unsigned int rgb = strtoul( value + 1, NULL, 16 );
                unsigned int alpha = ( strlen( value ) > 7 ) ? ( rgb >> 24 ) : 0xff;
@@ -274,7 +274,7 @@ static inline int mlt_property_atoi( const char *value )
        // interpreted as octal.
        else if ( value[0] == '0' && value[1] == 'x' )
        {
-               return strtol( value + 2, NULL, 16 );
+               return strtoul( value + 2, NULL, 16 );
        }
        else
        {
@@ -427,7 +427,7 @@ char *mlt_property_get_string( mlt_property this )
                {
                        this->types |= mlt_prop_string;
                        this->prop_string = malloc( 32 );
-                       sprintf( this->prop_string, "%lld", this->prop_int64 );
+                        sprintf( this->prop_string, "%lld", (long long int)this->prop_int64 );
                }
                else if ( this->types & mlt_prop_data && this->serialiser != NULL )
                {