X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedits.C;h=a8e668f844c3dedf15322cc0abc320e7600a2525;hb=4b6c39e6cf4a3fd9c1b347db6de686ab55d6cac8;hp=7d152bc5ef0e59c50155e2a2a34bedbb78dd0863;hpb=21b49090a36821cfe97bdfc573c7fbacc80653d1;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edits.C b/cinelerra-5.1/cinelerra/edits.C
index 7d152bc5..a8e668f8 100644
--- a/cinelerra-5.1/cinelerra/edits.C
+++ b/cinelerra-5.1/cinelerra/edits.C
@@ -408,7 +408,7 @@ int Edits::optimize()
 	    		current = current->next;
 		}
 
-		if(last && last->silence()) {
+		if(last && last->silence() && !last->transition ) {
 			delete last;
 			result = 1;
 		}
@@ -657,8 +657,7 @@ int Edits::clear_handle(double start, double end,
 
 		if(current_edit->asset && current_edit->next->asset) {
 
-			if(current_edit->asset->equivalent(*current_edit->next->asset,
-				0, 0)) {
+			if(current_edit->asset->equivalent(*current_edit->next->asset, 0, 0, edl)) {
 
 // Got two consecutive edits in same source
 				if(edl->equivalent(track->from_units(current_edit->next->startproject),
@@ -820,7 +819,7 @@ Edit *Edits::create_silence(int64_t start, int64_t end)
 	}
 	return new_edit;
 }
-				     
+
 Edit* Edits::shift(int64_t position, int64_t difference)
 {
 	Edit *new_edit = split_edit(position);