revert setting mlt_image_format to yuv420p

[mlt] / src / modules / sdl / producer_sdl_image.c

diff --git a/src/modules/sdl/producer_sdl_image.c b/src/modules/sdl/producer_sdl_image.c
index bb7bdfba049c32a34251787b3d638ff70b675d6d..6bee9ee2130ef1197c08a73ce27e7ee13ff453d3 100644 (file)
--- a/src/modules/sdl/producer_sdl_image.c
+++ b/src/modules/sdl/producer_sdl_image.c
@@ -65,15 +65,11 @@ static int producer_get_image( mlt_frame frame, uint8_t **image, mlt_image_forma
                        *image = mlt_pool_alloc( image_size );
                        memcpy( *image, surface->pixels, image_size );
                        break;
-               case 24:
+               default:
                        *format = mlt_image_rgb24;
                        *image = mlt_pool_alloc( image_size );
                        memcpy( *image, surface->pixels, image_size );
                        break;
-               default:
-                       *image = mlt_pool_alloc( image_size );
-                       memcpy( *image, converted->pixels, image_size );
-                       break;
        }
 
        if ( converted )
@@ -161,8 +157,8 @@ static SDL_Surface *load_image( mlt_producer producer )
                                surface->refcount ++;
                                mlt_properties_set_data( properties, "_surface", surface, 0, ( mlt_destructor )SDL_FreeSurface, 0 );
                                mlt_properties_set( properties, "_last_resource", this_resource );
-                               mlt_properties_set_int( properties, "_real_width", surface->w );
-                               mlt_properties_set_int( properties, "_real_height", surface->h );
+                               mlt_properties_set_int( properties, "meta.media.width", surface->w );
+                               mlt_properties_set_int( properties, "meta.media.height", surface->h );
                        }
                }
                else if ( surface != NULL )
@@ -199,8 +195,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                        mlt_properties_set_int( properties, "progressive", 1 );
                        mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( producer_props, "aspect_ratio" ) );
                        mlt_properties_set_data( properties, "surface", surface, 0, ( mlt_destructor )SDL_FreeSurface, NULL );
-                       mlt_properties_set_int( properties, "real_width", surface->w );
-                       mlt_properties_set_int( properties, "real_height", surface->h );
 
                        // Push the get_image method
                        mlt_frame_push_get_image( *frame, producer_get_image );