From 6fba6c383f2d7845f9eedf9f4e5e099319cfb43f Mon Sep 17 00:00:00 2001
From: lilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Mon, 12 Jan 2004 14:41:10 +0000
Subject: [PATCH] minor corrections

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@67 d19143bc-622f-0410-bfdd-b5b2a6649095
---
 mlt/src/inigo/inigo.c                  |   18 +++++++++++-------
 mlt/src/modules/inigo/producer_inigo.c |    9 ++++++---
 src/inigo/inigo.c                      |   18 +++++++++++-------
 src/modules/inigo/producer_inigo.c     |    9 ++++++---
 4 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/mlt/src/inigo/inigo.c b/mlt/src/inigo/inigo.c
index d6d7fbf..2dbda0e 100644
--- a/mlt/src/inigo/inigo.c
+++ b/mlt/src/inigo/inigo.c
@@ -170,26 +170,30 @@ int main( int argc, char **argv )
 		// Parse the arguments
 		for ( i = 1; i < argc; i ++ )
 		{
-			if ( !strcmp( argv[ i ], "-serialise" ) )
-			{
-				i ++;
-			}
-			else if ( !strcmp( argv[ i ], "-consumer" ) )
+			if ( !strcmp( argv[ i ], "-consumer" ) )
 			{
 				consumer = create_consumer( argv[ ++ i ], inigo );
 				while ( argv[ i + 1 ] != NULL && strstr( argv[ i + 1 ], "=" ) )
 					mlt_properties_parse( group, argv[ ++ i ] );
 			}
+			else if ( !strcmp( argv[ i ], "-serialise" ) )
+			{
+				i ++;
+			}
 			else
 			{
 				if ( store != NULL )
 					fprintf( store, "%s\n", argv[ i ] );
+
+				i ++;
+
 				while ( argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
 				{
-					i += 2;
-					if ( store != NULL && argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
+					if ( store != NULL )
 						fprintf( store, "%s\n", argv[ i ] );
+					i += 1;
 				}
+
 				i --;
 			}
 		}
diff --git a/mlt/src/modules/inigo/producer_inigo.c b/mlt/src/modules/inigo/producer_inigo.c
index efe2d76..581db3d 100644
--- a/mlt/src/modules/inigo/producer_inigo.c
+++ b/mlt/src/modules/inigo/producer_inigo.c
@@ -219,11 +219,14 @@ mlt_producer producer_inigo_init( char **argv )
 		else
 		{
 			if ( !strcmp( argv[ i ], "-serialise" ) )
-				i ++;
+				i += 2;
 			else if ( !strcmp( argv[ i ], "-consumer" ) )
+				i += 2;
+
+			while ( argv[ i ] != NULL && strchr( argv[ i ], '=' ) )
 				i ++;
-			else while ( argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
-				i ++;
+
+			i --;
 		}
 	}
 
diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index d6d7fbf..2dbda0e 100644
--- a/src/inigo/inigo.c
+++ b/src/inigo/inigo.c
@@ -170,26 +170,30 @@ int main( int argc, char **argv )
 		// Parse the arguments
 		for ( i = 1; i < argc; i ++ )
 		{
-			if ( !strcmp( argv[ i ], "-serialise" ) )
-			{
-				i ++;
-			}
-			else if ( !strcmp( argv[ i ], "-consumer" ) )
+			if ( !strcmp( argv[ i ], "-consumer" ) )
 			{
 				consumer = create_consumer( argv[ ++ i ], inigo );
 				while ( argv[ i + 1 ] != NULL && strstr( argv[ i + 1 ], "=" ) )
 					mlt_properties_parse( group, argv[ ++ i ] );
 			}
+			else if ( !strcmp( argv[ i ], "-serialise" ) )
+			{
+				i ++;
+			}
 			else
 			{
 				if ( store != NULL )
 					fprintf( store, "%s\n", argv[ i ] );
+
+				i ++;
+
 				while ( argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
 				{
-					i += 2;
-					if ( store != NULL && argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
+					if ( store != NULL )
 						fprintf( store, "%s\n", argv[ i ] );
+					i += 1;
 				}
+
 				i --;
 			}
 		}
diff --git a/src/modules/inigo/producer_inigo.c b/src/modules/inigo/producer_inigo.c
index efe2d76..581db3d 100644
--- a/src/modules/inigo/producer_inigo.c
+++ b/src/modules/inigo/producer_inigo.c
@@ -219,11 +219,14 @@ mlt_producer producer_inigo_init( char **argv )
 		else
 		{
 			if ( !strcmp( argv[ i ], "-serialise" ) )
-				i ++;
+				i += 2;
 			else if ( !strcmp( argv[ i ], "-consumer" ) )
+				i += 2;
+
+			while ( argv[ i ] != NULL && strchr( argv[ i ], '=' ) )
 				i ++;
-			else while ( argv[ i ] != NULL && argv[ i ][ 0 ] != '-' )
-				i ++;
+
+			i --;
 		}
 	}
 
-- 
1.7.4.4