From 420671be045c7fcc1624d68395cb833a5cc2de31 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sat, 9 Jul 2016 16:59:01 -0600 Subject: [PATCH] add ffmpeg image2 formats, fix segv when quit with render menu active --- cinelerra-5.1/cinelerra/formatpopup.C | 2 +- cinelerra-5.1/cinelerra/formattools.C | 6 +++--- cinelerra-5.1/cinelerra/mwindow.C | 5 ++--- cinelerra-5.1/ffmpeg/video/bmp.bmp | 1 + cinelerra-5.1/ffmpeg/video/bmp.dfl | 1 + cinelerra-5.1/ffmpeg/video/pam.dfl | 1 + cinelerra-5.1/ffmpeg/video/pam.pam | 1 + cinelerra-5.1/ffmpeg/video/pbm.dfl | 1 + cinelerra-5.1/ffmpeg/video/pbm.pbm | 1 + cinelerra-5.1/ffmpeg/video/pcx.dfl | 1 + cinelerra-5.1/ffmpeg/video/pcx.pcx | 1 + cinelerra-5.1/ffmpeg/video/pgm.dfl | 1 + cinelerra-5.1/ffmpeg/video/pgm.pgm | 1 + cinelerra-5.1/ffmpeg/video/pgmyuv.dfl | 1 + cinelerra-5.1/ffmpeg/video/pgmyuv.pgmyuv | 1 + cinelerra-5.1/ffmpeg/video/png.dfl | 1 + cinelerra-5.1/ffmpeg/video/png.png | 1 + cinelerra-5.1/ffmpeg/video/ppm.dfl | 1 + cinelerra-5.1/ffmpeg/video/ppm.ppm | 1 + cinelerra-5.1/ffmpeg/video/sgi.dfl | 1 + cinelerra-5.1/ffmpeg/video/sgi.sgi | 1 + cinelerra-5.1/ffmpeg/video/tiff.dfl | 1 + cinelerra-5.1/ffmpeg/video/tiff.tiff | 1 + cinelerra-5.1/ffmpeg/video/tiff48.tiff | 2 ++ 24 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 cinelerra-5.1/ffmpeg/video/bmp.bmp create mode 100644 cinelerra-5.1/ffmpeg/video/bmp.dfl create mode 100644 cinelerra-5.1/ffmpeg/video/pam.dfl create mode 100644 cinelerra-5.1/ffmpeg/video/pam.pam create mode 100644 cinelerra-5.1/ffmpeg/video/pbm.dfl create mode 100644 cinelerra-5.1/ffmpeg/video/pbm.pbm create mode 100644 cinelerra-5.1/ffmpeg/video/pcx.dfl create mode 100644 cinelerra-5.1/ffmpeg/video/pcx.pcx create mode 100644 cinelerra-5.1/ffmpeg/video/pgm.dfl create mode 100644 cinelerra-5.1/ffmpeg/video/pgm.pgm create mode 100644 cinelerra-5.1/ffmpeg/video/pgmyuv.dfl create mode 100644 cinelerra-5.1/ffmpeg/video/pgmyuv.pgmyuv create mode 100644 cinelerra-5.1/ffmpeg/video/png.dfl create mode 100644 cinelerra-5.1/ffmpeg/video/png.png create mode 100644 cinelerra-5.1/ffmpeg/video/ppm.dfl create mode 100644 cinelerra-5.1/ffmpeg/video/ppm.ppm create mode 100644 cinelerra-5.1/ffmpeg/video/sgi.dfl create mode 100644 cinelerra-5.1/ffmpeg/video/sgi.sgi create mode 100644 cinelerra-5.1/ffmpeg/video/tiff.dfl create mode 100644 cinelerra-5.1/ffmpeg/video/tiff.tiff create mode 100644 cinelerra-5.1/ffmpeg/video/tiff48.tiff diff --git a/cinelerra-5.1/cinelerra/formatpopup.C b/cinelerra-5.1/cinelerra/formatpopup.C index e80769ce..fa520abc 100644 --- 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 *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 1f3fc3ca..ef1a0b3b 100644 --- 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 0d4421e9..714e9ddd 100644 --- 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 index 00000000..50884162 --- /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 index 00000000..c848116e --- /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 index 00000000..9472ac89 --- /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 index 00000000..92737ae1 --- /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 index 00000000..1e12edbc --- /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 index 00000000..126ee417 --- /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 index 00000000..6280db97 --- /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 index 00000000..d6eeda93 --- /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 index 00000000..53cf8e57 --- /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 index 00000000..8befa28b --- /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 index 00000000..d4c9c84b --- /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 index 00000000..c93204be --- /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 index 00000000..0292a5be --- /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 index 00000000..aeaef1e9 --- /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 index 00000000..050a1b46 --- /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 index 00000000..33b99c0e --- /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 index 00000000..42e1a4f1 --- /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 index 00000000..543d1a12 --- /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 index 00000000..a05831a9 --- /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 index 00000000..09927d96 --- /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 index 00000000..8af40d7b --- /dev/null +++ b/cinelerra-5.1/ffmpeg/video/tiff48.tiff @@ -0,0 +1,2 @@ +image2 tiff +pixel_format=rgb48 -- 2.26.2