projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
filebox changes, mts fix, dvd/bd create changes, motionwindow layout
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
edits.C
diff --git
a/cinelerra-5.1/cinelerra/edits.C
b/cinelerra-5.1/cinelerra/edits.C
index 7d152bc5ef0e59c50155e2a2a34bedbb78dd0863..9cab7c2a48f877739313a165e165c7bfdc5ac9cd 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edits.C
+++ b/
cinelerra-5.1/cinelerra/edits.C
@@
-408,7
+408,7
@@
int Edits::optimize()
current = current->next;
}
current = current->next;
}
- if(last && last->silence()) {
+ if(last && last->silence()
&& !last->transition
) {
delete last;
result = 1;
}
delete last;
result = 1;
}
@@
-820,7
+820,7
@@
Edit *Edits::create_silence(int64_t start, int64_t end)
}
return new_edit;
}
}
return new_edit;
}
-
+
Edit* Edits::shift(int64_t position, int64_t difference)
{
Edit *new_edit = split_edit(position);
Edit* Edits::shift(int64_t position, int64_t difference)
{
Edit *new_edit = split_edit(position);