X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_playlist.c;h=0433a743779b084bbafa0c415e5c148cd6e2d54e;hb=cab7cd53c3a4d9c4355751088fec61860dcabbce;hp=68c0dc7f6380797675cf68e52a01e43572488c6f;hpb=7979a37dedd6e43689a8436a860ee284f7273529;p=melted

diff --git a/src/framework/mlt_playlist.c b/src/framework/mlt_playlist.c
index 68c0dc7..0433a74 100644
--- a/src/framework/mlt_playlist.c
+++ b/src/framework/mlt_playlist.c
@@ -872,14 +872,14 @@ int mlt_playlist_split_at( mlt_playlist this, mlt_position position, int left )
 
 int mlt_playlist_join( mlt_playlist this, int clip, int count, int merge )
 {
-	int error = clip < 0 || ( clip ) >= this->count;
+	int error = clip < 0 || clip >= this->count;
 	if ( error == 0 )
 	{
 		int i = clip;
 		mlt_playlist new_clip = mlt_playlist_init( );
 		mlt_events_block( MLT_PLAYLIST_PROPERTIES( this ), this );
 		if ( clip + count >= this->count )
-			count = this->count - clip;
+			count = this->count - clip - 1;
 		for ( i = 0; i <= count; i ++ )
 		{
 			playlist_entry *entry = this->list[ clip ];
@@ -1329,7 +1329,7 @@ int mlt_playlist_clip_start( mlt_playlist this, int clip )
 	mlt_playlist_clip_info info;
 	if ( mlt_playlist_get_clip_info( this, &info, clip ) == 0 )
 		return info.start;
-	return clip < 0 ? 0 : mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( this ) ) + 1;
+	return clip < 0 ? 0 : mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( this ) );
 }
 
 int mlt_playlist_clip_length( mlt_playlist this, int clip )