correction on playlist ffmpeg sizing issue and additional sdl tweaks

[melted] / mlt / src / modules / ffmpeg / producer_ffmpeg.c

diff --git a/mlt/src/modules/ffmpeg/producer_ffmpeg.c b/mlt/src/modules/ffmpeg/producer_ffmpeg.c
index de829cd..4506ff8 100644 (file)
--- a/mlt/src/modules/ffmpeg/producer_ffmpeg.c
+++ b/mlt/src/modules/ffmpeg/producer_ffmpeg.c
@@ -370,7 +370,10 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
        mlt_properties_set_double( properties, "speed", speed );
 
        // Set the out point on the producer
-       mlt_producer_set_in_and_out( &this->parent, mlt_producer_get_in( &this->parent ), mlt_producer_position( &this->parent ) + 1 );
+       if ( !this->end_of_video || !this->end_of_audio )
+               mlt_producer_set_in_and_out( &this->parent, mlt_producer_get_in( &this->parent ), mlt_producer_position( &this->parent ) + 1 );
+       else
+               mlt_producer_set_in_and_out( &this->parent, mlt_producer_get_in( &this->parent ), mlt_producer_position( &this->parent ) );
 
        // Update timecode on the frame we're creating
        mlt_frame_set_timecode( *frame, mlt_producer_position( producer ) );