bugfixes

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@131 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/setenv b/setenv
index fe41a89a277f7b2ac78e91cb0478ccc140e3790c..4206f17c5003ee0bfd455b74d14863b794e7757f 100644 (file)
--- a/setenv
+++ b/setenv
@@ -10,7 +10,7 @@ export LD_LIBRARY_PATH=\
 `pwd`/src/modules/bluefish:\
 `pwd`/../bluefish/lib:\
 `pwd`/../mpeg_sdk_release/bin:\
-`pwd`/../dv_sdk_release
+`pwd`/../dv_sdk_release/lib
 
 export PATH=\
 `pwd`/src/albino:\

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index 1921783ab88f64d4ac71680668d83365f1cf2722..9ae6d798b568951dc9e4ae5c07ce76d4a3528878 100644 (file)
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -240,6 +240,8 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
        char *eof = mlt_properties_get( mlt_producer_properties( this ), "eof" );
 
        // A properly instatiated producer will have a get_frame method...
+//fprintf( stderr, "PRODUCER get_frame %p eof %s pos %lld out %lld\n",
+//this->get_frame, eof, mlt_producer_position( this ), mlt_producer_get_out( this ) );
        if ( this->get_frame == NULL || ( !strcmp( eof, "continue" ) && mlt_producer_position( this ) > mlt_producer_get_out( this ) ) )
        {
                // Generate a test frame

diff --git a/src/modules/fezzik/producer_fezzik.c b/src/modules/fezzik/producer_fezzik.c
index bd43e1ccb75757fe60caba1524af4a995af4ef1e..d5f686e043712c3db2030e5f24003702dea54f37 100644 (file)
--- a/src/modules/fezzik/producer_fezzik.c
+++ b/src/modules/fezzik/producer_fezzik.c
@@ -61,6 +61,8 @@ static mlt_producer create_producer( char *file )
                result = mlt_factory_producer( "pixbuf", file );
        else if ( strstr( file, ".png" ) )
                result = mlt_factory_producer( "pixbuf", file );
+       else if ( strstr( file, ".svg" ) )
+               result = mlt_factory_producer( "pixbuf", file );
        else if ( strstr( file, ".txt" ) )
                result = mlt_factory_producer( "pango", file );
        else if ( strstr( file, ".westley" ) )
@@ -108,7 +110,9 @@ static mlt_service create_filter( mlt_tractor tractor, mlt_service last, char *e
 mlt_producer producer_fezzik_init( char *arg )
 {
        // Create the producer that the tractor will contain
-       mlt_producer producer = create_producer( arg );
+       mlt_producer producer = NULL;
+       if ( arg != NULL )
+               producer = create_producer( arg );
 
        // Build the tractor if we have a producer and it isn't already westley'd :-)
        if ( producer != NULL && mlt_properties_get( mlt_producer_properties( producer ), "westley" ) == NULL )

diff --git a/src/modules/resample/filter_resample.c b/src/modules/resample/filter_resample.c
index e2e52e85fa87f717c95c5a2f871341ae115a32b8..b4fd13d77e56fa8f736694435230cffb1ea70114 100644 (file)
--- a/src/modules/resample/filter_resample.c
+++ b/src/modules/resample/filter_resample.c
@@ -54,7 +54,8 @@ static int resample_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
        // Get the producer's audio
        mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples );
 
-       //fprintf( stderr, "resample_get_audio: output_rate %d\n", output_rate, *frequency );
+       //fprintf( stderr, "resample_get_audio: output_rate %d\n", output_rate );
+       
        // Return now if now work to do
        if ( output_rate == *frequency )
                return 0;

diff --git a/src/modules/westley/producer_westley.c b/src/modules/westley/producer_westley.c
index bd27f3ace5aac985462c22c798eac3bd52ee0624..9ac5fa3b9819a04a9386e233d79b0a550bba80f4 100644 (file)
--- a/src/modules/westley/producer_westley.c
+++ b/src/modules/westley/producer_westley.c
@@ -299,7 +299,7 @@ static void on_end_track( deserialise_context context, const xmlChar *name )
                        mlt_properties_get_position( mlt_service_properties( track ), "in" ),
                        mlt_properties_get_position( mlt_service_properties( track ), "out" ) );
        }
-       
+
        // Push the multitrack back onto the stack
        context_push_service( context, service );
 
@@ -372,8 +372,8 @@ static void on_end_producer( deserialise_context context, const xmlChar *name )
                return;
                
        // Instatiate the producer
-       service = MLT_SERVICE( mlt_factory_producer( "fezzik", mlt_properties_get( properties, "resource" ) ) );
-       
+       if ( mlt_properties_get( properties, "resource" ) != NULL )
+               service = MLT_SERVICE( mlt_factory_producer( "fezzik", mlt_properties_get( properties, "resource" ) ) );
        if ( service == NULL && mlt_properties_get( properties, "mlt_service" ) != NULL )
        {
                service = MLT_SERVICE( mlt_factory_producer( mlt_properties_get( properties, "mlt_service" ),