Merge branch 'master' of https://github.com/mltframework/mlt

diff --git a/configure b/configure
index ebae6ad4dcfb60a8398e3541e2c5d32c6c6a75d0..a170e71a03878d0e0de953ab34e7c03348ebb0a6 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export version=0.8.6
+export version=0.8.7
 export soversion=5
 
 show_help()

diff --git a/src/framework/mlt_version.h b/src/framework/mlt_version.h
index 9aa8743115ef646533aa40420d3c3f0433391def..92d60dea26180b49c38f24e57b0b0bce53e6078a 100644 (file)
--- a/src/framework/mlt_version.h
+++ b/src/framework/mlt_version.h
@@ -29,7 +29,7 @@
 
 #define LIBMLT_VERSION_MAJOR    0
 #define LIBMLT_VERSION_MINOR    8
-#define LIBMLT_VERSION_REVISION 6
+#define LIBMLT_VERSION_REVISION 7
 #define LIBMLT_VERSION_INT      ((LIBMLT_VERSION_MAJOR<<16)+(LIBMLT_VERSION_MINOR<<8)+LIBMLT_VERSION_REVISION)
 #define LIBMLT_VERSION          STRINGIZE(LIBMLT_VERSION_MAJOR.LIBMLT_VERSION_MINOR.LIBMLT_VERSION_REVISION)
 

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index dbece63517771edaedb7daeb0d426a1db3ac2719..d72de3ac7cdceb30f8edecfe5da6ed11782ca987 100644 (file)
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -212,7 +212,7 @@ static int load_sequence_deprecated( producer_pixbuf self, mlt_properties proper
                        strncpy( s, start, n );
                        mlt_properties_set( properties, "begin", s );
                        free( s );
-                       s = calloc( 1, strlen( filename ) );
+                       s = calloc( 1, strlen( filename ) + 2 );
                        strncpy( s, filename, start - filename );
                        sprintf( s + ( start - filename ), ".%d%s", n, end );
                        result = load_sequence_sprintf( self, properties, s );

diff --git a/src/modules/qimage/kdenlivetitle_wrapper.cpp b/src/modules/qimage/kdenlivetitle_wrapper.cpp
index 54469905ad0beadba8eb20fbec94da9ca98c137a..a4d2a0d4106b3c360ae29624d1e41acaa9fbd9be 100755 (executable)
--- a/src/modules/qimage/kdenlivetitle_wrapper.cpp
+++ b/src/modules/qimage/kdenlivetitle_wrapper.cpp
@@ -392,7 +392,6 @@ void drawKdenliveTitle( producer_ktitle self, mlt_frame frame, int width, int he
                                        {
                                                mlt_log_panic( MLT_PRODUCER_SERVICE( producer ), "Error, cannot render titles without an X11 environment.\nPlease either run melt from an X session or use a fake X server like xvfb:\nxvfb-run -a melt (...)\n" );
                                                pthread_mutex_unlock( &self->mutex );
-                                               exit(1);
                                                return;
                                        }
 #endif

diff --git a/src/modules/qimage/producer_qimage.c b/src/modules/qimage/producer_qimage.c
index 98d6f472fc54e7041dd6f29dd2b8cacdb02e3cf6..e65e92444d79913ea4d71b9cedb25d14b98c1fd2 100644 (file)
--- a/src/modules/qimage/producer_qimage.c
+++ b/src/modules/qimage/producer_qimage.c
@@ -157,7 +157,7 @@ static int load_sequence_deprecated( producer_qimage self, mlt_properties proper
                        strncpy( s, start, n );
                        mlt_properties_set( properties, "begin", s );
                        free( s );
-                       s = calloc( 1, strlen( filename ) );
+                       s = calloc( 1, strlen( filename ) + 2 );
                        strncpy( s, filename, start - filename );
                        sprintf( s + ( start - filename ), ".%d%s", n, end );
                        result = load_sequence_sprintf( self, properties, s );

diff --git a/src/modules/videostab/stab/klt/error.c b/src/modules/videostab/stab/klt/error.c
index 0731cf2cb6d3680109f457e8e1584366e4c3d7c2..5cb4ee4edb5492a6ec94b21d7254cc1e963c4434 100644 (file)
--- a/src/modules/videostab/stab/klt/error.c
+++ b/src/modules/videostab/stab/klt/error.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-
+#include <framework/mlt_log.h>
 
 /*********************************************************************
  * KLTError
@@ -25,11 +25,10 @@ void KLTError(char *fmt, ...)
   va_list args;
 
   va_start(args, fmt);
-  fprintf(stderr, "KLT Error: ");
-  vfprintf(stderr, fmt, args);
-  fprintf(stderr, "\n");
+  mlt_log_error(NULL, "KLT Error: ");
+  mlt_log_error(NULL, fmt, args);
+  mlt_log_error(NULL, "\n");
   va_end(args);
-  exit(1);
 }