rest of Termux related mods from Andrew

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 44bbe2fa0e423464058ecebefd75700046e8410b..3655d643fb097f4f954c768aeabf26bef44e6e60 100644 (file)
--- 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;
                ret = -1;
 
        ret = ret > 0 ? 1 : ret < 0 ? -1 : 0;

+       av_frame_free(&frame);

        return ret;
 }
 
        return ret;
 }
 

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index 93279934cb9b56fa4ac5615357ba5a4915b0a6ac..c57cd6203c8f6569a1b24b6feb7c2cfbb7d9f6a9 100644 (file)
--- 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");
        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);
                exit(1);

+               }

        }
        if(XGetIMValues(input_method, XNQueryInputStyle, &xim_styles, NULL) ||
                        xim_styles == NULL)
        }
        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 ac69ba20659f0aa99dd8dca62585fc0a5cce3f3e..d928b7e8ac2868e32e70b4b0f5bdb84cf6ae95fc 100644 (file)
--- 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"
 #include "filexml.h"
 #include "guicast.h"
 #include "language.h"

-#if HAVE_DV
+#ifdef HAVE_LIBDV

 #include "libdv.h"
 #endif
 #include "libmjpeg.h"
 #include "libdv.h"
 #endif
 #include "libmjpeg.h"


@@ -152,7 +152,7 @@ public:
        int prev_channel;
        int w, h;
 // Decompressors for different video drivers
        int prev_channel;
        int w, h;
 // Decompressors for different video drivers

-#if HAVE_DV
+#ifdef HAVE_LIBDV

        dv_t *dv;
 #endif
        mjpeg_t *mjpeg;
        dv_t *dv;
 #endif
        mjpeg_t *mjpeg;


@@ -354,7 +354,7 @@ LiveVideo::LiveVideo(PluginServer *server)
        w = xS(320);
        h = yS(640);
        prev_channel = 0;
        w = xS(320);
        h = yS(640);
        prev_channel = 0;

-#if HAVE_DV
+#ifdef HAVE_LIBDV

        dv = 0;
 #endif
        mjpeg = 0;
        dv = 0;
 #endif
        mjpeg = 0;


@@ -376,7 +376,7 @@ LiveVideo::~LiveVideo()
 
        delete channeldb;
        delete temp;
 
        delete channeldb;
        delete temp;

-#if HAVE_DV
+#ifdef HAVE_LIBDV

        if(dv) dv_delete(dv);
 #endif
        if(mjpeg) mjpeg_delete(mjpeg);
        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)
                                {
                        {
                                switch(session->vconfig_in->driver)
                                {

-#if HAVE_DV
+#ifdef HAVE_LIBDV

                                        case CAPTURE_FIREWIRE:
                                        case CAPTURE_IEC61883:
 // Decompress a DV frame from the driver
                                        case CAPTURE_FIREWIRE:
                                        case CAPTURE_IEC61883:
 // Decompress a DV frame from the driver


@@ -648,8 +648,3 @@ void LiveVideo::update_gui()
                }
        }
 }
                }
        }
 }

-
-
-
-
-