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
/
filebase.C
diff --git
a/cinelerra-5.0/cinelerra/filebase.C
b/cinelerra-5.0/cinelerra/filebase.C
index 6d1b4e944dabdb53aceb83d749416db2f0252efc..be2a9b79ccc3efe56546565e33d32a086d579845 100644
(file)
--- a/
cinelerra-5.0/cinelerra/filebase.C
+++ b/
cinelerra-5.0/cinelerra/filebase.C
@@
-22,7
+22,7
@@
#include "asset.h"
#include "assets.h"
#include "byteorder.h"
#include "asset.h"
#include "assets.h"
#include "byteorder.h"
-#include "
color
models.h"
+#include "
bcc
models.h"
#include "format.inc"
#include "file.h"
#include "filebase.h"
#include "format.inc"
#include "file.h"
#include "filebase.h"
@@
-37,7
+37,6
@@
FileBase::FileBase(Asset *asset, File *file)
this->file = file;
this->asset = asset;
internal_byte_order = get_byte_order();
this->file = file;
this->asset = asset;
internal_byte_order = get_byte_order();
- init_ima4();
reset_parameters();
overlayer = new OverlayFrame;
}
reset_parameters();
overlayer = new OverlayFrame;
}
@@
-49,7
+48,6
@@
FileBase::~FileBase()
if(row_pointers_out) delete [] row_pointers_out;
if(float_buffer) delete [] float_buffer;
delete overlayer;
if(row_pointers_out) delete [] row_pointers_out;
if(float_buffer) delete [] float_buffer;
delete overlayer;
- delete_ima4();
}
int FileBase::close_file()
}
int FileBase::close_file()
@@
-69,7
+67,6
@@
int FileBase::close_file()
close_file_derived();
reset_parameters();
close_file_derived();
reset_parameters();
- delete_ima4();
return 0;
}
return 0;
}