projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add threads param to ffmpeg plugins, spec fix, added m2t ext
[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..a8e668f844c3dedf15322cc0abc320e7600a2525 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;
}
@@
-657,8
+657,7
@@
int Edits::clear_handle(double start, double end,
if(current_edit->asset && current_edit->next->asset) {
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),
// 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;
}
}
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);