X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fffmpeg%2Fproducer_ffmpeg.c;h=cc7613084df086cd2aa71b01976932aae1cc7ad7;hb=5a4ba0b72c9f1fc6945b4f9e680fc1ac4e2df5c9;hp=15b1c89ec5c0698f67e2304e507f8c6d75c30a69;hpb=6336039a203c6496691784682f9ad56eb13abcc3;p=melted

diff --git a/src/modules/ffmpeg/producer_ffmpeg.c b/src/modules/ffmpeg/producer_ffmpeg.c
index 15b1c89..cc76130 100644
--- a/src/modules/ffmpeg/producer_ffmpeg.c
+++ b/src/modules/ffmpeg/producer_ffmpeg.c
@@ -465,7 +465,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 	if ( video != NULL && read_ffmpeg_header( this, &width, &height ) == 2 )
 	{
 		// Allocate an image
-		uint8_t *image = malloc( width * height * 2 );
+		uint8_t *image = mlt_pool_alloc( width * ( height + 1 ) * 2 );
 		
 		// Read it
 		while( skip -- )
@@ -482,7 +482,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 		mlt_convert_yuv420p_to_yuv422( this->buffer, width, height, width, image );
 
 		// Pass the data on the frame properties
-		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 );
 		mlt_properties_set_int( properties, "width", width );
 		mlt_properties_set_int( properties, "height", height );
 		mlt_properties_set_int( properties, "has_image", 1 );
@@ -517,11 +517,11 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 
 	// Get the additional properties
 	double aspect_ratio = mlt_properties_get_double( producer_properties, "aspect_ratio" );
-	double speed = mlt_properties_get_double( producer_properties, "speed" );
+	double speed = mlt_producer_get_speed( producer );
 
 	// Set them on the frame
 	mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
-	mlt_properties_set_double( properties, "speed", speed );
+	mlt_properties_set_double( properties, "_speed", speed );
 
 	// Set the out point on the producer
 	if ( this->end_of_video && this->end_of_audio )