From: Dan Dennedy <dan@dennedy.org>
Date: Sun, 26 Sep 2010 20:50:42 +0000 (-0700)
Subject: Fix compile errors in latest commits to melt.c.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a37ba516ccfd38f324463826820a918adf288417;p=mlt

Fix compile errors in latest commits to melt.c.
---

diff --git a/src/melt/melt.c b/src/melt/melt.c
index 7cd53a46..d518b88f 100644
--- a/src/melt/melt.c
+++ b/src/melt/melt.c
@@ -179,7 +179,7 @@ static mlt_consumer create_consumer( mlt_profile profile, char *id )
 	return consumer;
 }
 
-static void load_consumer( mlt_consumer &consumer, int argc, const char **argv )
+static void load_consumer( mlt_consumer *consumer, mlt_profile profile, int argc, char **argv )
 {
 	int i;
 	for ( i = 1; i < argc; i ++ )
@@ -294,7 +294,7 @@ static void transport( mlt_producer producer, mlt_consumer consumer )
 	}
 }
 
-static void show_usage( const char *program_name )
+static void show_usage( char *program_name )
 {
 	fprintf( stderr,
 "Usage: %s [options] [producer [name=value]* ]+\n"
@@ -533,7 +533,7 @@ query_all:
 		is_profile_explicit = 1;
 
 	// Look for the consumer option to load profile settings from consumer properties
-	load_consumer( &consumer, argc, argv );
+	load_consumer( &consumer, profile, argc, argv );
 
 	// Make backup of profile for determining if we need to use 'consumer' producer.
 	backup_profile = mlt_profile_init( NULL );
@@ -572,7 +572,7 @@ query_all:
 		}
 
 		// Reload the consumer with the fully qualified profile
-		load_consumer( consumer, argc, argv );
+		load_consumer( &consumer, profile, argc, argv );
 
 		// If we have no consumer, default to sdl
 		if ( store == NULL && consumer == NULL )