From: Good Guy <good1.2guy@gmail.com>
Date: Tue, 29 Oct 2019 00:39:31 +0000 (-0600)
Subject: add new av-opts files from andrew, fix copy/paste segv for clip folder, fix deinterla... 
X-Git-Tag: 2019-10~2
X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=commitdiff_plain;h=bb4d66ab59531240df079c4b115d8f4d202d29ad

add new av-opts files from andrew, fix copy/paste segv for clip folder, fix deinterlace-cv deadlock/dials, radio btns in seltempavg
---

diff --git a/cinelerra-5.1/cinelerra/clippopup.C b/cinelerra-5.1/cinelerra/clippopup.C
index ab7efaf5..ddcee5d9 100644
--- 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');
-			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);
 		}
diff --git a/cinelerra-5.1/ffmpeg/audio/dca.qt b/cinelerra-5.1/ffmpeg/audio/dca.qt
new file mode 100644
index 00000000..b625628f
--- /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
index 00000000..6c648ce8
--- /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
index 00000000..97cfeb65
--- /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
index 00000000..6899e99d
--- /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
index 00000000..b7967673
--- /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
index 00000000..6a7e3911
--- /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
index 00000000..e58ac47d
--- /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
index 00000000..f9131250
--- /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
index 00000000..a27c81ec
--- /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
index 00000000..f0aa2c73
--- /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 068be6de..bd090e47 100644
--- 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();
-	set_mode(client->config.mode,0);
+	set_mode(client->config.mode, 1);
 }
 
 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")));
+			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")));
+			threshold->show_window(0);
 			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 d8e51ba9..c4dc3a70 100644
--- 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 result = get_value();
+	int result = type;
 	client->config.method = result;
 
 	gui->method_none->update(client->config.method       == SelTempAvgConfig::METHOD_NONE);