p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / filetiff.C

diff --git a/cinelerra-5.1/cinelerra/filetiff.C b/cinelerra-5.1/cinelerra/filetiff.C
index b7891ac7ad1f5ec1a757774938376f3160600e9b..fb1449f1c7b4d7b9e5eeeca73f535af86321e1b4 100644 (file)
--- a/cinelerra-5.1/cinelerra/filetiff.C
+++ b/cinelerra-5.1/cinelerra/filetiff.C
@@ -46,10 +46,8 @@ FileTIFF::~FileTIFF()
 
 
 void FileTIFF::get_parameters(BC_WindowBase *parent_window,
-       Asset *asset,
-       BC_WindowBase* &format_window,
-       int audio_options,
-       int video_options)
+       Asset *asset, BC_WindowBase* &format_window,
+       int audio_options, int video_options, EDL *edl)
 {
        if(video_options)
        {
@@ -512,12 +510,8 @@ int FileTIFF::write_frame(VFrame *frame, VFrame *data, FrameWriterUnit *unit)
                }
                if(!tiff_unit->temp)
                {
-                       tiff_unit->temp = new VFrame(0,
-                               -1,
-                               asset->width,
-                               asset->height,
-                               color_model,
-                               -1);
+                       tiff_unit->temp =
+                               new VFrame(asset->width, asset->height, color_model, 0);
                }
 
                BC_CModels::transfer(tiff_unit->temp->get_rows(),
@@ -605,7 +599,7 @@ TIFFConfigVideo::~TIFFConfigVideo()
 
 void TIFFConfigVideo::create_objects()
 {
-       lock_window("TIFFConfigVideo::create_objects()");
+       lock_window("TIFFConfigVideo::create_objects");
        int x = 10, y = 10;
 
        add_subwindow(new BC_Title(x, y, _("Colorspace:")));