From: ddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Tue, 10 Feb 2004 05:53:33 +0000 (+0000)
Subject: bugfixes
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=0942454258a07166839a999c71b6fa35785ac70a;p=melted

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 fe41a89..4206f17 100644
--- 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 1921783..9ae6d79 100644
--- 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 bd43e1c..d5f686e 100644
--- 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 e2e52e8..b4fd13d 100644
--- 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 bd27f3a..9ac5fa3 100644
--- 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" ),