Permalink
Browse files

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

  • Loading branch information...
2 parents 1005675 + 1248276 commit 1c9f53690bb4abf12d1d88c3c73078fba9c39b09 @j-b-m j-b-m committed Nov 19, 2012
View
@@ -1,6 +1,6 @@
#!/bin/sh
-export version=0.8.6
+export version=0.8.7
export soversion=5
show_help()
@@ -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)
@@ -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 );
@@ -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
@@ -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 );
@@ -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);
}

0 comments on commit 1c9f536

Please sign in to comment.