From: lilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Fri, 31 Dec 2004 08:19:39 +0000 (+0000)
Subject: Fix for join length correction
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=2216e73bda74f15e98e1d5667d518b14f0df8823;p=melted

Fix for join length correction


git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@589 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/src/framework/mlt_playlist.c b/src/framework/mlt_playlist.c
index 68c0dc7..59dfea4 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 ];