X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fplus%2Ffilter_affine.c;fp=src%2Fmodules%2Fplus%2Ffilter_affine.c;h=0fa4a86c5a99babf2db8dd7904bd24bd782e011f;hb=9029c77b04ddf9c9d9becacca56615607bb84234;hp=e465a35165f7f61cabd7b47c5ed2cf1dc7c5bc8d;hpb=efd5f25f6fe70f75f9787e9c7f2b53730ecf6048;p=melted

diff --git a/src/modules/plus/filter_affine.c b/src/modules/plus/filter_affine.c
index e465a35..0fa4a86 100644
--- a/src/modules/plus/filter_affine.c
+++ b/src/modules/plus/filter_affine.c
@@ -65,6 +65,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 			char *name = mlt_properties_get( properties, "_unique_id" );
 			mlt_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES( this ), name );
 			mlt_properties frame_properties = MLT_FRAME_PROPERTIES( this );
+			double consumer_ar = mlt_properties_get_double( frame_properties, "consumer_aspect_ratio" );
 			mlt_properties_set_position( MLT_TRANSITION_PROPERTIES( transition ), "in", mlt_filter_get_in( filter ) );
 			mlt_properties_set_position( MLT_TRANSITION_PROPERTIES( transition ), "out", mlt_filter_get_out( filter ) );
 			mlt_producer_seek( producer, position );
@@ -74,8 +75,14 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 			mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &a_frame, 0 );
 			mlt_properties_set( MLT_FRAME_PROPERTIES( a_frame ), "rescale.interp", "nearest" );
 			mlt_properties_set_int( MLT_FRAME_PROPERTIES( a_frame ), "distort", 1 );
-			mlt_properties_set_double( MLT_FRAME_PROPERTIES( a_frame ), "consumer_aspect_ratio", 
-									   mlt_properties_get_double( frame_properties, "consumer_aspect_ratio" ) );
+
+			// Special case - aspect_ratio = 0
+			if ( mlt_properties_get_double( frame_properties, "aspect_ratio" ) == 0 )
+				mlt_properties_set_double( frame_properties, "aspect_ratio", consumer_ar );
+			if ( mlt_properties_get_double( MLT_FRAME_PROPERTIES( a_frame ), "aspect_ratio" ) == 0 )
+				mlt_properties_set_double( MLT_FRAME_PROPERTIES( a_frame ), "aspect_ratio", consumer_ar );
+			mlt_properties_set_double( MLT_FRAME_PROPERTIES( a_frame ), "consumer_aspect_ratio", consumer_ar );
+
 			mlt_transition_process( transition, a_frame, this );
 			mlt_frame_get_image( a_frame, image, format, width, height, writable );
 			mlt_properties_set_data( frame_properties, "affine_frame", a_frame, 0, (mlt_destructor)mlt_frame_close, NULL );