remove consumer_aspect_ratio property - use profile instead

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

diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c
index 31e8e06933826a952fb2a370d346619391d894fe..b5adba315b159e22ad61d41b3d2a89167cc50f31 100644 (file)
--- a/src/modules/core/filter_watermark.c
+++ b/src/modules/core/filter_watermark.c
@@ -143,17 +143,17 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                        // Get the a and b frame properties
                        mlt_properties a_props = MLT_FRAME_PROPERTIES( frame );
                        mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame );
+                       mlt_profile profile = mlt_service_profile( service );
 
                        // Set the b frame to be in the same position and have same consumer requirements
                        mlt_frame_set_position( b_frame, position );
-                       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_int( a_props, "consumer_deinterlace" ) || mlt_properties_get_int( properties, "deinterlace" ) );
 
                        // Check for the special case - no aspect ratio means no problem :-)
                        if ( mlt_frame_get_aspect_ratio( b_frame ) == 0 )
-                               mlt_properties_set_double( b_props, "aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+                               mlt_frame_set_aspect_ratio( b_frame, mlt_profile_sar( profile ) );
                        if ( mlt_frame_get_aspect_ratio( frame ) == 0 )
-                               mlt_properties_set_double( a_props, "aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+                               mlt_frame_set_aspect_ratio( frame, mlt_profile_sar( profile ) );
 
                        if ( mlt_properties_get_int( properties, "distort" ) )
                        {