projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to ffmpeg-2.8
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
edl.C
diff --git
a/cinelerra-5.0/cinelerra/edl.C
b/cinelerra-5.0/cinelerra/edl.C
index 8085c77eabebee3bbb79c9b66bc45e894cafd0ea..05e7618cfdf26c98045716e5e84db3a5b9d9922a 100644
(file)
--- a/
cinelerra-5.0/cinelerra/edl.C
+++ b/
cinelerra-5.0/cinelerra/edl.C
@@
-27,7
+27,7
@@
#include "awindowgui.inc"
#include "bcsignals.h"
#include "clip.h"
#include "awindowgui.inc"
#include "bcsignals.h"
#include "clip.h"
-#include "
color
models.h"
+#include "
bcc
models.h"
#include "bchash.h"
#include "edits.h"
#include "edl.h"
#include "bchash.h"
#include "edits.h"
#include "edl.h"
@@
-882,8
+882,9
@@
void EDL::remove_from_project(ArrayList<EDL*> *clips)
{
if(this->clips.get(j) == clips->values[i])
{
{
if(this->clips.get(j) == clips->values[i])
{
- this->clips.get(j)->Garbage::remove_user();
- this->clips.remove(this->clips.get(j));
+ EDL *clip = this->clips.get(j);
+ this->clips.remove(clip);
+ clip->Garbage::remove_user();
}
}
}
}
}
}