X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Fproducer_ppm.c;h=4155783b377cb0daccfca30ccea0cf87ebf1ff06;hb=3f7c53230945e427b019ba5df4fec587e19e29c1;hp=c929d2572e7dc7de4dcb512297bfcb712755a68a;hpb=7c518e80321a87a22d2e48835442c9f5b70dcd17;p=melted

diff --git a/src/modules/core/producer_ppm.c b/src/modules/core/producer_ppm.c
index c929d25..4155783 100644
--- a/src/modules/core/producer_ppm.c
+++ b/src/modules/core/producer_ppm.c
@@ -19,7 +19,9 @@
  */
 
 #include "producer_ppm.h"
+
 #include <framework/mlt_frame.h>
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -81,9 +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 )
 		{
-			uint8_t *image = malloc( *width * *height * 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 * 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 )
@@ -220,18 +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
-		uint8_t *image = malloc( width * height * 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 * 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", 1 );
 
 		// Push the image callback
 		mlt_frame_push_get_image( *frame, producer_get_image );
@@ -269,4 +272,3 @@ static void producer_close( mlt_producer parent )
 	mlt_producer_close( parent );
 	free( this );
 }
-