X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fffmpeg%2Fproducer_ffmpeg.c;h=cc7613084df086cd2aa71b01976932aae1cc7ad7;hb=bd208d01a2a792e698a9b4884b43602b2f245a8f;hp=43b8a2e2ec3b18c787a1077381c8435b811b2d3c;hpb=1d46befd8150131541aa98e93573d5d6e54e9c3a;p=melted

diff --git a/src/modules/ffmpeg/producer_ffmpeg.c b/src/modules/ffmpeg/producer_ffmpeg.c
index 43b8a2e..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,14 +482,13 @@ 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 );
 
 		// Push the image callback
 		mlt_frame_push_get_image( *frame, producer_get_image );
-
 	}
 	else
 	{
@@ -505,28 +504,24 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 		}
 
 		// Push the image callback
-		mlt_frame_push_get_image( *frame, producer_get_image );
+		if ( !this->end_of_video )
+			mlt_frame_push_get_image( *frame, producer_get_image );
 	}
 
 	// Set the audio pipe
 	mlt_properties_set_data( properties, "producer_ffmpeg", this, 0, NULL, NULL );
 
 	// Hmm - register audio callback
-	( *frame )->get_audio = producer_get_audio;
+	if ( !this->end_of_audio )
+		( *frame )->get_audio = producer_get_audio;
 
 	// Get the additional properties
 	double aspect_ratio = mlt_properties_get_double( producer_properties, "aspect_ratio" );
-	double speed = mlt_properties_get_double( producer_properties, "speed" );
-	char *video_file = mlt_properties_get( producer_properties, "video_file" );
+	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 );
-	if ( strchr( video_file, '/' ) != NULL )
-		mlt_properties_set( properties, "file", strrchr( video_file, '/' ) + 1 );
-	else
-		mlt_properties_set( properties, "file", video_file );
-
+	mlt_properties_set_double( properties, "_speed", speed );
 
 	// Set the out point on the producer
 	if ( this->end_of_video && this->end_of_audio )