From: Good Guy <good1.2guy@gmail.com>
Date: Fri, 19 Nov 2021 16:33:44 +0000 (-0700)
Subject: rest of Termux related mods from Andrew
X-Git-Tag: 2021-11~5
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=0c48864cab7b37268025485c6a227f36b3420030;p=goodguy%2Fcinelerra.git

rest of Termux related mods from Andrew
---

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 44bbe2fa..3655d643 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -1246,6 +1246,7 @@ int FFVideoStream::probe(int64_t pos)
 		ret = -1;
 
 	ret = ret > 0 ? 1 : ret < 0 ? -1 : 0;
+	av_frame_free(&frame);
 	return ret;
 }
 
diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index 93279934..c57cd620 100644
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -2530,7 +2530,11 @@ void BC_WindowBase::init_im()
 	if(!(input_method = XOpenIM(display, NULL, NULL, NULL)))
 	{
 		printf("BC_WindowBase::init_im: Could not open input method.\n");
+		XSetLocaleModifiers("@im=local");
+		if(!(input_method = XOpenIM(display, NULL, NULL, NULL))) {
+		printf("BC_WindowBase::init_im: Could not open input method local.\n");
 		exit(1);
+		}
 	}
 	if(XGetIMValues(input_method, XNQueryInputStyle, &xim_styles, NULL) ||
 			xim_styles == NULL)
diff --git a/cinelerra-5.1/plugins/livevideo/livevideo.C b/cinelerra-5.1/plugins/livevideo/livevideo.C
index ac69ba20..d928b7e8 100644
--- a/cinelerra-5.1/plugins/livevideo/livevideo.C
+++ b/cinelerra-5.1/plugins/livevideo/livevideo.C
@@ -31,7 +31,7 @@
 #include "filexml.h"
 #include "guicast.h"
 #include "language.h"
-#if HAVE_DV
+#ifdef HAVE_LIBDV
 #include "libdv.h"
 #endif
 #include "libmjpeg.h"
@@ -152,7 +152,7 @@ public:
 	int prev_channel;
 	int w, h;
 // Decompressors for different video drivers
-#if HAVE_DV
+#ifdef HAVE_LIBDV
 	dv_t *dv;
 #endif
 	mjpeg_t *mjpeg;
@@ -354,7 +354,7 @@ LiveVideo::LiveVideo(PluginServer *server)
 	w = xS(320);
 	h = yS(640);
 	prev_channel = 0;
-#if HAVE_DV
+#ifdef HAVE_LIBDV
 	dv = 0;
 #endif
 	mjpeg = 0;
@@ -376,7 +376,7 @@ LiveVideo::~LiveVideo()
 
 	delete channeldb;
 	delete temp;
-#if HAVE_DV
+#ifdef HAVE_LIBDV
 	if(dv) dv_delete(dv);
 #endif
 	if(mjpeg) mjpeg_delete(mjpeg);
@@ -507,7 +507,7 @@ int LiveVideo::process_buffer(VFrame *frame,
 			{
 				switch(session->vconfig_in->driver)
 				{
-#if HAVE_DV
+#ifdef HAVE_LIBDV
 					case CAPTURE_FIREWIRE:
 					case CAPTURE_IEC61883:
 // Decompress a DV frame from the driver
@@ -648,8 +648,3 @@ void LiveVideo::update_gui()
 		}
 	}
 }
-
-
-
-
-