add ffmpeg image2 formats, fix segv when quit with render menu active

diff --git a/cinelerra-5.1/cinelerra/formatpopup.C b/cinelerra-5.1/cinelerra/formatpopup.C
index e80769ce8ea9cf8f0d9d6f7d12cbca9c556876aa..fa520abc053ecdeab726586f00ba79f75b57319e 100644 (file)
--- a/cinelerra-5.1/cinelerra/formatpopup.C
+++ b/cinelerra-5.1/cinelerra/formatpopup.C
@@ -97,7 +97,7 @@ int FormatPopup::handle_event()
 
 
 FFMPEGPopup::FFMPEGPopup(ArrayList<PluginServer*> *plugindb, int x, int y)
- : BC_ListBox(x, y, 50, 200, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
+ : BC_ListBox(x, y, 100, 200, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
 {
        this->plugindb = plugindb;
        set_tooltip(_("Set ffmpeg file type"));

diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C
index 1f3fc3caac80295bdcb64ce3d5e25e58376cd6e7..ef1a0b3b6032a55f2f4da75a5c21a799fffd4ae7 100644 (file)
--- a/cinelerra-5.1/cinelerra/formattools.C
+++ b/cinelerra-5.1/cinelerra/formattools.C
@@ -204,17 +204,17 @@ void FormatTools::create_objects(int &init_x,
        x = init_x;
        window->add_subwindow(format_title = new BC_Title(x, y, _("File Format:")));
        x += 90;
-       window->add_subwindow(format_text = new BC_TextBox(x, y, 180, 1,
+       window->add_subwindow(format_text = new BC_TextBox(x, y, 160, 1,
                File::formattostr(asset->format)));
        x += format_text->get_w();
 //printf("FormatTools::create_objects %d %p\n", __LINE__, window);
        window->add_subwindow(format_button = new FormatFormat(x, y, this));
        format_button->create_objects();
        x += format_button->get_w() + 5;
-       window->add_subwindow(ffmpeg_type = new FFMpegType(x, y+5, 50, 1, asset->fformat));
+       window->add_subwindow(ffmpeg_type = new FFMpegType(x, y, 64, 1, asset->fformat));
        FFMPEG::set_asset_format(asset, asset->fformat);
        x += ffmpeg_type->get_w();
-       window->add_subwindow(format_ffmpeg = new FormatFFMPEG(x, y+5, this));
+       window->add_subwindow(format_ffmpeg = new FormatFFMPEG(x, y, this));
        format_ffmpeg->create_objects();
        x = init_x;
        y += format_button->get_h() + 10;

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 0d4421e930c2acb9b83e084e93179aa7fca0c9ab..714e9dddd17d7d6b8441959f1cf1688598c1d0fb 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -235,6 +235,7 @@ MWindow::~MWindow()
        delete create_bd;       create_bd = 0;
        delete create_dvd;      create_dvd = 0;
        delete batch_render;    batch_render = 0;
+       delete render;          render = 0;
        commit_commercial();
        if( commercials && !commercials->remove_user() ) commercials = 0;
 
@@ -292,15 +293,13 @@ MWindow::~MWindow()
        finit_error();
        keyframe_threads->remove_all_objects();
        colormodels.remove_all_objects();
-       delete gui;             gui = 0;
-       delete render;          render = 0;
        delete awindow;         awindow = 0;
        delete lwindow;         lwindow = 0;
        delete twindow;         twindow = 0;
        delete wwindow;         wwindow = 0;
        delete gwindow;         gwindow = 0;
-       // must be last or nouveau chokes
        delete cwindow;         cwindow = 0;
+       delete gui;             gui = 0;
        //delete file_server;  file_server = 0; // reusable
        delete mainindexes;     mainindexes = 0;
        delete mainprogress;    mainprogress = 0;

diff --git a/cinelerra-5.1/ffmpeg/video/bmp.bmp b/cinelerra-5.1/ffmpeg/video/bmp.bmp
new file mode 100644 (file)
index 0000000..5088416
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/bmp.bmp
@@ -0,0 +1 @@
+image2 bmp

diff --git a/cinelerra-5.1/ffmpeg/video/bmp.dfl b/cinelerra-5.1/ffmpeg/video/bmp.dfl
new file mode 100644 (file)
index 0000000..c848116
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/bmp.dfl
@@ -0,0 +1 @@
+bmp.bmp

diff --git a/cinelerra-5.1/ffmpeg/video/pam.dfl b/cinelerra-5.1/ffmpeg/video/pam.dfl
new file mode 100644 (file)
index 0000000..9472ac8
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/pam.dfl
@@ -0,0 +1 @@
+pam.pam

diff --git a/cinelerra-5.1/ffmpeg/video/pam.pam b/cinelerra-5.1/ffmpeg/video/pam.pam
new file mode 100644 (file)
index 0000000..92737ae
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/pam.pam
@@ -0,0 +1 @@
+image2 pam

diff --git a/cinelerra-5.1/ffmpeg/video/pbm.dfl b/cinelerra-5.1/ffmpeg/video/pbm.dfl
new file mode 100644 (file)
index 0000000..1e12edb
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/pbm.dfl
@@ -0,0 +1 @@
+pbm.pbm

diff --git a/cinelerra-5.1/ffmpeg/video/pbm.pbm b/cinelerra-5.1/ffmpeg/video/pbm.pbm
new file mode 100644 (file)
index 0000000..126ee41
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/pbm.pbm
@@ -0,0 +1 @@
+image2 pbm

diff --git a/cinelerra-5.1/ffmpeg/video/pcx.dfl b/cinelerra-5.1/ffmpeg/video/pcx.dfl
new file mode 100644 (file)
index 0000000..6280db9
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/pcx.dfl
@@ -0,0 +1 @@
+pcx.pcx

diff --git a/cinelerra-5.1/ffmpeg/video/pcx.pcx b/cinelerra-5.1/ffmpeg/video/pcx.pcx
new file mode 100644 (file)
index 0000000..d6eeda9
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/pcx.pcx
@@ -0,0 +1 @@
+image2 pcx

diff --git a/cinelerra-5.1/ffmpeg/video/pgm.dfl b/cinelerra-5.1/ffmpeg/video/pgm.dfl
new file mode 100644 (file)
index 0000000..53cf8e5
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/pgm.dfl
@@ -0,0 +1 @@
+pgm.pgm

diff --git a/cinelerra-5.1/ffmpeg/video/pgm.pgm b/cinelerra-5.1/ffmpeg/video/pgm.pgm
new file mode 100644 (file)
index 0000000..8befa28
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/pgm.pgm
@@ -0,0 +1 @@
+image2 pgm

diff --git a/cinelerra-5.1/ffmpeg/video/pgmyuv.dfl b/cinelerra-5.1/ffmpeg/video/pgmyuv.dfl
new file mode 100644 (file)
index 0000000..d4c9c84
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/pgmyuv.dfl
@@ -0,0 +1 @@
+pgmyuv.pgmyuv

diff --git a/cinelerra-5.1/ffmpeg/video/pgmyuv.pgmyuv b/cinelerra-5.1/ffmpeg/video/pgmyuv.pgmyuv
new file mode 100644 (file)
index 0000000..c93204b
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/pgmyuv.pgmyuv
@@ -0,0 +1 @@
+image2 pgmyuv

diff --git a/cinelerra-5.1/ffmpeg/video/png.dfl b/cinelerra-5.1/ffmpeg/video/png.dfl
new file mode 100644 (file)
index 0000000..0292a5b
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/png.dfl
@@ -0,0 +1 @@
+png.png

diff --git a/cinelerra-5.1/ffmpeg/video/png.png b/cinelerra-5.1/ffmpeg/video/png.png
new file mode 100644 (file)
index 0000000..aeaef1e
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/png.png
@@ -0,0 +1 @@
+image2 png

diff --git a/cinelerra-5.1/ffmpeg/video/ppm.dfl b/cinelerra-5.1/ffmpeg/video/ppm.dfl
new file mode 100644 (file)
index 0000000..050a1b4
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/ppm.dfl
@@ -0,0 +1 @@
+ppm.ppm

diff --git a/cinelerra-5.1/ffmpeg/video/ppm.ppm b/cinelerra-5.1/ffmpeg/video/ppm.ppm
new file mode 100644 (file)
index 0000000..33b99c0
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/ppm.ppm
@@ -0,0 +1 @@
+image2 ppm

diff --git a/cinelerra-5.1/ffmpeg/video/sgi.dfl b/cinelerra-5.1/ffmpeg/video/sgi.dfl
new file mode 100644 (file)
index 0000000..42e1a4f
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/sgi.dfl
@@ -0,0 +1 @@
+sgi.sgi

diff --git a/cinelerra-5.1/ffmpeg/video/sgi.sgi b/cinelerra-5.1/ffmpeg/video/sgi.sgi
new file mode 100644 (file)
index 0000000..543d1a1
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/sgi.sgi
@@ -0,0 +1 @@
+image2 sgi

diff --git a/cinelerra-5.1/ffmpeg/video/tiff.dfl b/cinelerra-5.1/ffmpeg/video/tiff.dfl
new file mode 100644 (file)
index 0000000..a05831a
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/tiff.dfl
@@ -0,0 +1 @@
+tiff.tiff

diff --git a/cinelerra-5.1/ffmpeg/video/tiff.tiff b/cinelerra-5.1/ffmpeg/video/tiff.tiff
new file mode 100644 (file)
index 0000000..09927d9
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/tiff.tiff
@@ -0,0 +1 @@
+image2 tiff

diff --git a/cinelerra-5.1/ffmpeg/video/tiff48.tiff b/cinelerra-5.1/ffmpeg/video/tiff48.tiff
new file mode 100644 (file)
index 0000000..8af40d7
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/tiff48.tiff
@@ -0,0 +1,2 @@
+image2 tiff
+pixel_format=rgb48