add new av-opts files from andrew, fix copy/paste segv for clip folder, fix deinterla...

diff --git a/cinelerra-5.1/cinelerra/clippopup.C b/cinelerra-5.1/cinelerra/clippopup.C
index ab7efaf5b7c4a11c91ff08fdbc9c826e292a2bb1..ddcee5d9543cda1be3a489212b72484bd211c3f9 100644 (file)
--- a/cinelerra-5.1/cinelerra/clippopup.C
+++ b/cinelerra-5.1/cinelerra/clippopup.C
@@ -379,7 +379,7 @@ int ClipPasteToFolder::handle_event()
                }
                else {
                        char *cp = strchr(string, '\n');
                }
                else {
                        char *cp = strchr(string, '\n');

-                       if( cp-string < 32 ) *cp = 0;
+                       if( cp && cp-string < 32 ) *cp = 0;

                        else if( len > 32 ) string[32] = 0;
                        eprintf("paste buffer is not EDL:\n%s", string);
                }
                        else if( len > 32 ) string[32] = 0;
                        eprintf("paste buffer is not EDL:\n%s", string);
                }

diff --git a/cinelerra-5.1/ffmpeg/audio/dca.qt b/cinelerra-5.1/ffmpeg/audio/dca.qt
new file mode 100644 (file)
index 0000000..b625628
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/audio/dca.qt
@@ -0,0 +1,3 @@
+mov dca
+# dca is an audio file format that uses opus audio packets and json metadata
+strict -2

diff --git a/cinelerra-5.1/ffmpeg/video/asv1.avi b/cinelerra-5.1/ffmpeg/video/asv1.avi
new file mode 100644 (file)
index 0000000..6c648ce
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/asv1.avi
@@ -0,0 +1 @@
+avi asv1

diff --git a/cinelerra-5.1/ffmpeg/video/asv2.avi b/cinelerra-5.1/ffmpeg/video/asv2.avi
new file mode 100644 (file)
index 0000000..97cfeb6
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/asv2.avi
@@ -0,0 +1 @@
+avi asv2

diff --git a/cinelerra-5.1/ffmpeg/video/cinepak.qt b/cinelerra-5.1/ffmpeg/video/cinepak.qt
new file mode 100644 (file)
index 0000000..6899e99
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/cinepak.qt
@@ -0,0 +1,2 @@
+mov cinepak
+# this encoder is very slow

diff --git a/cinelerra-5.1/ffmpeg/video/dv_ntsc.avi b/cinelerra-5.1/ffmpeg/video/dv_ntsc.avi
new file mode 100644 (file)
index 0000000..b796767
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/dv_ntsc.avi
@@ -0,0 +1,4 @@
+avi dvvideo
+pixel_format=yuv411p
+top=0
+# 720x480, 29.97 fps

diff --git a/cinelerra-5.1/ffmpeg/video/magicyuv.qt b/cinelerra-5.1/ffmpeg/video/magicyuv.qt
new file mode 100644 (file)
index 0000000..6a7e391
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/magicyuv.qt
@@ -0,0 +1,5 @@
+mov magicyuv
+# A high-performance, ultra-fast, mathematically lossless video codec for recording, archiving,
+#   video post-production and uncompressed-quality playout at high resolutions.
+cin_pix_fmt yuv444p
+threads=2

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

diff --git a/cinelerra-5.1/ffmpeg/video/r210.qt b/cinelerra-5.1/ffmpeg/video/r210.qt
new file mode 100644 (file)
index 0000000..f913125
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/r210.qt
@@ -0,0 +1,2 @@
+mov r210
+# Blackmagic Design

diff --git a/cinelerra-5.1/ffmpeg/video/utvideo.qt b/cinelerra-5.1/ffmpeg/video/utvideo.qt
new file mode 100644 (file)
index 0000000..a27c81e
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/utvideo.qt
@@ -0,0 +1,4 @@
+mov utvideo
+# Fast/lossless codec based on Huffman code developed as an alternative to HuffYUV for better compression.
+cin_pix_fmt yuv444p
+threads=2

diff --git a/cinelerra-5.1/ffmpeg/video/v210.qt b/cinelerra-5.1/ffmpeg/video/v210.qt
new file mode 100644 (file)
index 0000000..f0aa2c7
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/v210.qt
@@ -0,0 +1,2 @@
+mov v210
+# AJA Video System Xena

diff --git a/cinelerra-5.1/plugins/deinterlace-cv/deinterwindow-cv.C b/cinelerra-5.1/plugins/deinterlace-cv/deinterwindow-cv.C
index 068be6de64c2363b1bcbb5f3f768f62861f0ee39..bd090e4754df22b356114f4f0bcd07944ea76760 100644 (file)
--- a/cinelerra-5.1/plugins/deinterlace-cv/deinterwindow-cv.C
+++ b/cinelerra-5.1/plugins/deinterlace-cv/deinterwindow-cv.C
@@ -60,7 +60,7 @@ void DeInterlaceWindow::create_objects()
        add_tool(status = new BC_Title(x, y, string));
        flash();
        show_window();
        add_tool(status = new BC_Title(x, y, string));
        flash();
        show_window();

-       set_mode(client->config.mode,0);
+       set_mode(client->config.mode, 1);

 }
 
 void DeInterlaceWindow::get_status_string(char *string, int changed_rows)
 }
 
 void DeInterlaceWindow::get_status_string(char *string, int changed_rows)


@@ -127,11 +127,13 @@ int DeInterlaceWindow::set_mode(int mode, int recursive)
 
                        add_subwindow(threshold = new DeInterlaceThreshold(client, x + xS(150), y));
                        add_subwindow(threshold->title_caption=new BC_Title(x+xS(150), y + yS(50), _("Threshold")));
 
                        add_subwindow(threshold = new DeInterlaceThreshold(client, x + xS(150), y));
                        add_subwindow(threshold->title_caption=new BC_Title(x+xS(150), y + yS(50), _("Threshold")));

+                       threshold->show_window(0);

                        adaptive->update(client->config.adaptive?BC_Toggle::TOGGLE_CHECKED:0);
                        break;
                case DEINTERLACE_BOBWEAVE:
                        add_subwindow(threshold = new DeInterlaceThreshold(client, x + xS(150), y));
                        add_subwindow(threshold->title_caption=new BC_Title(x+xS(150), y + yS(50), _("Bob Threshold")));
                        adaptive->update(client->config.adaptive?BC_Toggle::TOGGLE_CHECKED:0);
                        break;
                case DEINTERLACE_BOBWEAVE:
                        add_subwindow(threshold = new DeInterlaceThreshold(client, x + xS(150), y));
                        add_subwindow(threshold->title_caption=new BC_Title(x+xS(150), y + yS(50), _("Bob Threshold")));

+                       threshold->show_window(0);

                        break;
                case DEINTERLACE_NONE:
                case DEINTERLACE_KEEP:
                        break;
                case DEINTERLACE_NONE:
                case DEINTERLACE_KEEP:

diff --git a/cinelerra-5.1/plugins/denoiseseltempavg/seltempavgwindow.C b/cinelerra-5.1/plugins/denoiseseltempavg/seltempavgwindow.C
index d8e51ba9db6480c81237fab5630bde9efc41f11c..c4dc3a70333b0a975d3bf830a356530fed76c525 100644 (file)
--- a/cinelerra-5.1/plugins/denoiseseltempavg/seltempavgwindow.C
+++ b/cinelerra-5.1/plugins/denoiseseltempavg/seltempavgwindow.C
@@ -258,7 +258,7 @@ SelTempAvgMethodRadial::SelTempAvgMethodRadial(SelTempAvgMain *client,
 }
 int SelTempAvgMethodRadial::handle_event()
 {
 }
 int SelTempAvgMethodRadial::handle_event()
 {

-       int result = get_value();
+       int result = type;

        client->config.method = result;
 
        gui->method_none->update(client->config.method       == SelTempAvgConfig::METHOD_NONE);
        client->config.method = result;
 
        gui->method_none->update(client->config.method       == SelTempAvgConfig::METHOD_NONE);