composite aspect ratio fix (again ;-)), added fill compositing test case, filter...

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

diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c
index a22bac3..1b343c3 100644 (file)
--- a/src/modules/core/filter_watermark.c
+++ b/src/modules/core/filter_watermark.c
@@ -41,14 +41,11 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 
        if ( composite == NULL )
        {
-               char *geometry = mlt_properties_get( properties, "geometry" );
-               composite = mlt_factory_transition( "composite", geometry == NULL ? "85%,5%:10%x10%" : geometry );
+               composite = mlt_factory_transition( "composite", NULL );
                if ( composite != NULL )
                {
                        mlt_properties composite_properties = mlt_transition_properties( composite );
-                       char *distort = mlt_properties_get( properties, "distort" );
-                       if ( distort != NULL )
-                               mlt_properties_set( composite_properties, "distort", distort );
+                       mlt_properties_pass( composite_properties, properties, "composite." );
                        mlt_properties_set_data( properties, "composite", composite, 0, ( mlt_destructor )mlt_transition_close, NULL );
                }
        }
@@ -62,6 +59,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                {
                        mlt_properties producer_properties = mlt_producer_properties( producer );
                        mlt_properties_set( producer_properties, "eof", "loop" );
+                       mlt_properties_pass( producer_properties, properties, "producer." );
                        mlt_properties_set_data( properties, "producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL );
                }
        }