projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
batchrender asset path fix, ru xlat, fixup hevc/h265 opts, expand new bg pngs
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
edit.C
diff --git
a/cinelerra-5.1/cinelerra/edit.C
b/cinelerra-5.1/cinelerra/edit.C
index b54da4f500ca81b7e877209cb1c1921d12322c70..3658922df6d816a62cc1486e396072d7900649fd 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edit.C
+++ b/
cinelerra-5.1/cinelerra/edit.C
@@
-282,7
+282,7
@@
void Edit::equivalent_output(Edit *edit, int64_t *result)
!transition->identical(edit->transition)) ||
// Asset changed
(asset && edit->asset &&
!transition->identical(edit->transition)) ||
// Asset changed
(asset && edit->asset &&
- !asset->equivalent(*edit->asset, 1, 1)) ||
+ !asset->equivalent(*edit->asset, 1, 1
, edl
)) ||
// Nested EDL changed
(nested_edl && edit->nested_edl &&
strcmp(nested_edl->path, edit->nested_edl->path))
// Nested EDL changed
(nested_edl && edit->nested_edl &&
strcmp(nested_edl->path, edit->nested_edl->path))