X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_profile.c;h=ea5f098ec520f66c39210f3ff9719a4b6d8c2f05;hb=407f72e8c783f126b60fcfc53f0a790f3aaee636;hp=778bb538098dadd26aef839b3f38ded2948c57c3;hpb=d33f444d4ef4c7bc4074d07a49eca0ab7d108394;p=melted

diff --git a/src/framework/mlt_profile.c b/src/framework/mlt_profile.c
index 778bb53..ea5f098 100644
--- a/src/framework/mlt_profile.c
+++ b/src/framework/mlt_profile.c
@@ -89,9 +89,9 @@ mlt_profile mlt_profile_init( const char *name )
 	{
 		// MLT_PROFILE is preferred environment variable
 		if ( getenv( "MLT_PROFILE" ) )
-			profile = mlt_profile_select( mlt_environment( "MLT_PROFILE" ) );
+			profile = mlt_profile_select( getenv( "MLT_PROFILE" ) );
 		// MLT_NORMALISATION backwards compatibility
-		else if ( strcmp( mlt_environment( "MLT_NORMALISATION" ), "PAL" ) )
+		else if ( getenv( "MLT_NORMALISATION" ) && strcmp( getenv( "MLT_NORMALISATION" ), "PAL" ) )
 			profile = mlt_profile_select( "dv_ntsc" );
 		else
 			profile = mlt_profile_select( "dv_pal" );
@@ -109,8 +109,8 @@ mlt_profile mlt_profile_init( const char *name )
 				profile->width = 720;
 				profile->height = 576;
 				profile->progressive = 0;
-				profile->sample_aspect_num = 59;
-				profile->sample_aspect_den = 54;
+				profile->sample_aspect_num = 16;
+				profile->sample_aspect_den = 15;
 				profile->display_aspect_num = 4;
 				profile->display_aspect_den = 3;
 			}
@@ -145,19 +145,21 @@ mlt_profile mlt_profile_load_file( const char *file )
 
 	// Set MLT_NORMALISATION to appease legacy modules
 	char *profile_name = mlt_environment( "MLT_PROFILE" );
-	if ( strstr( profile_name, "_ntsc" ) ||
-	     strstr( profile_name, "_60" ) ||
-	     strstr( profile_name, "_30" ) )
+	if ( profile_name )
 	{
-		mlt_environment_set( "MLT_NORMALISATION", "NTSC" );
-	}
-	else if ( strstr( profile_name, "_pal" ) ||
-	          strstr( profile_name, "_50" ) ||
-	          strstr( profile_name, "_25" ) )
-	{
-		mlt_environment_set( "MLT_NORMALISATION", "PAL" );
+		if ( strstr( profile_name, "_ntsc" ) ||
+			strstr( profile_name, "_60" ) ||
+			strstr( profile_name, "_30" ) )
+		{
+			mlt_environment_set( "MLT_NORMALISATION", "NTSC" );
+		}
+		else if ( strstr( profile_name, "_pal" ) ||
+				strstr( profile_name, "_50" ) ||
+				strstr( profile_name, "_25" ) )
+		{
+			mlt_environment_set( "MLT_NORMALISATION", "PAL" );
+		}
 	}
-
 	return profile;
 }