X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Fproducer_ppm.c;h=a0a9896fdba941c96c13e5e7c2086ecf10c0fa78;hb=4a39b72c5ac8fd2dd6db81a95eab08adde0491b9;hp=ce7c500f06b74320193df0ad79b615078de28988;hpb=74268cd86c30a0af9f03981c799aa4bba253c6e9;p=melted

diff --git a/src/modules/core/producer_ppm.c b/src/modules/core/producer_ppm.c
index ce7c500..a0a9896 100644
--- a/src/modules/core/producer_ppm.c
+++ b/src/modules/core/producer_ppm.c
@@ -48,7 +48,7 @@ mlt_producer producer_ppm_init( void *command )
 		mlt_properties properties = mlt_producer_properties( producer );
 
 		producer->get_frame = producer_get_frame;
-		producer->close = producer_close;
+		producer->close = ( mlt_destructor )producer_close;
 
 		if ( command != NULL )
 		{
@@ -83,10 +83,9 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
 		// Convert to requested format
 		if ( *format == mlt_image_yuv422 )
 		{
-			// IRRIGATE ME
-			uint8_t *image = malloc( *width * ( *height + 1 ) * 2 );
+			uint8_t *image = mlt_pool_alloc( *width * ( *height + 1 ) * 2 );
 			mlt_convert_rgb24_to_yuv422( rgb, *width, *height, *width * 3, image );
-			mlt_properties_set_data( properties, "image", image, *width * ( *height + 1 ) * 2, free, NULL );
+			mlt_properties_set_data( properties, "image", image, *width * ( *height + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL );
 			*buffer = image;
 		}
 		else if ( *format == mlt_image_rgb24 )
@@ -223,21 +222,19 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 	// Read the video
 	if ( video != NULL && read_ppm_header( video, &width, &height ) == 2 )
 	{
-
 		// Allocate an image
-		// IRRIGATE ME
-		uint8_t *image = malloc( width * ( height + 1 ) * 3 );
+		uint8_t *image = mlt_pool_alloc( width * ( height + 1 ) * 3 );
 		
 		// Read it
 		fread( image, width * height * 3, 1, video );
 
 		// Pass the data on the frame properties
-		mlt_properties_set_data( properties, "image", image, width * ( height + 1 ) * 3, free, NULL );
+		mlt_properties_set_data( properties, "image", image, width * ( height + 1 ) * 3, ( mlt_destructor )mlt_pool_release, NULL );
 		mlt_properties_set_int( properties, "width", width );
 		mlt_properties_set_int( properties, "height", height );
 		mlt_properties_set_int( properties, "has_image", 1 );
 		mlt_properties_set_int( properties, "progressive", 1 );
-		mlt_properties_set_double( properties, "aspect_ratio", ( double )width  / height );
+		mlt_properties_set_double( properties, "aspect_ratio", 1 );
 
 		// Push the image callback
 		mlt_frame_push_get_image( *frame, producer_get_image );
@@ -275,4 +272,3 @@ static void producer_close( mlt_producer parent )
 	mlt_producer_close( parent );
 	free( this );
 }
-