X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_resize.c;h=ba27859b2947d3843594906ff4b4a18039e52980;hb=eae86b6ff2d11421e4839ffbe79c4c547d15751a;hp=dcaa2d0125a0ecd59fc3b77a704d656362f60d3c;hpb=2bdd20ae194e477238e5d44ddb5f77ad64e644cf;p=melted

diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c
index dcaa2d0..ba27859 100644
--- a/src/modules/core/filter_resize.c
+++ b/src/modules/core/filter_resize.c
@@ -34,7 +34,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 	int error = 0;
 
 	// Get the properties from the frame
-	mlt_properties properties = mlt_frame_properties( this );
+	mlt_properties properties = MLT_FRAME_PROPERTIES( this );
 
 	// Pop the top of stack now
 	mlt_filter filter = mlt_frame_pop_service( this );
@@ -48,7 +48,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 	if ( rescale != NULL && !strcmp( rescale, "none" ) )
 		return mlt_frame_get_image( this, image, format, width, height, writable );
 
-	if ( mlt_properties_get( properties, "distort" ) == NULL )
+	if ( mlt_properties_get_int( properties, "distort" ) == 0 )
 	{
 		// Normalise the input and out display aspect
 		int normalised_width = mlt_properties_get_int( properties, "normalised_width" );
@@ -62,6 +62,8 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 		double input_ar = mlt_frame_get_aspect_ratio( this ) * real_width / real_height;
 		double output_ar = mlt_properties_get_double( properties, "consumer_aspect_ratio" ) * owidth / oheight;
 		
+		//fprintf( stderr, "normalised %dx%d output %dx%d %f %f\n", normalised_width, normalised_height, owidth, oheight, ( float )output_ar, ( float )mlt_properties_get_double( properties, "consumer_aspect_ratio" ) * owidth / oheight );
+
 		// Optimised for the input_ar > output_ar case (e.g. widescreen on standard)
 		int scaled_width = input_ar / output_ar * normalised_width + 0.5;
 		int scaled_height = normalised_height;
@@ -92,7 +94,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 	if ( error == 0 && *format == mlt_image_yuv422 )
 	{
 		// Get the requested scale operation
-		char *op = mlt_properties_get( mlt_filter_properties( filter ), "scale" );
+		char *op = mlt_properties_get( MLT_FILTER_PROPERTIES( filter ), "scale" );
 
 		// Correct field order if needed
 		if ( mlt_properties_get_int( properties, "top_field_first" ) == 1 )
@@ -159,7 +161,7 @@ mlt_filter filter_resize_init( char *arg )
 	if ( mlt_filter_init( this, this ) == 0 )
 	{
 		this->process = filter_process;
-		mlt_properties_set( mlt_filter_properties( this ), "scale", arg == NULL ? "off" : arg );
+		mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "scale", arg == NULL ? "off" : arg );
 	}
 	return this;
 }