Attempt at an aspect ratio clean up

[mlt] / src / modules / core / filter_watermark.c

diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c
index 9f6b64d38bf8b31528ee294e6b7b8e8cd384b088..aee35ed3ed43f690b76fc092a4fcdad9460fc39f 100644 (file)
--- a/src/modules/core/filter_watermark.c
+++ b/src/modules/core/filter_watermark.c
@@ -144,6 +144,9 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                        mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
                        mlt_properties_set_int( b_props, "consumer_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) );
 
+                       mlt_properties_set_int( b_props, "normalised_width", mlt_properties_get_int( a_props, "normalised_width" ) );
+                       mlt_properties_set_int( b_props, "normalised_height", mlt_properties_get_int( a_props, "normalised_height" ) );
+
                        if ( mlt_properties_get_int( properties, "distort" ) )
                        {
                                mlt_properties_set( mlt_transition_properties( composite ), "distort", "true" );
@@ -168,6 +171,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                                int count = 0;
                                uint8_t *alpha = NULL;
                                mlt_transition_process( composite, b_frame, frame );
+                               mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_int( a_props, "consumer_aspect_ratio" ) );
                                mlt_properties_set_int( a_props, "consumer_deinterlace", 1 );
                                mlt_properties_set_int( b_props, "consumer_deinterlace", 1 );
                                mlt_properties_set( a_props, "rescale.interp", "nearest" );