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

diff --git a/src/modules/ffmpeg/producer_ffmpeg.c b/src/modules/ffmpeg/producer_ffmpeg.c
index 43b8a2e..2432529 100644
--- a/src/modules/ffmpeg/producer_ffmpeg.c
+++ b/src/modules/ffmpeg/producer_ffmpeg.c
@@ -489,7 +489,6 @@ 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 );
-
 	}
 	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 )